Try to use a here-document

sounddrill31 · Aug 4, 2024 · b6cf034 · b6cf034
1 parent 1f8c031
commit b6cf034
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -151,7 +151,12 @@ jobs:
           if [[ "${{ github.event.inputs.LOCAL_MANIFEST }}" =~ \.xml(/)?$ ]]; then
             local_manifest_url="${{ github.event.inputs.LOCAL_MANIFEST }}"
             local_manifest_url="${local_manifest_url%/}"  # remove trailing slash if it exists
-            export LOCAL_MANIFEST='mkdir -p .repo/local_manifests; rm -rf .repo/local_manifests/*; curl -o .repo/local_manifests/local_manifest.xml '"${local_manifest_url}"
+            export LOCAL_MANIFEST=$(cat <<EOF
+            mkdir -p .repo/local_manifests && \
+            rm -rf .repo/local_manifests/* && \
+            curl -o .repo/local_manifests/local_manifest.xml "${local_manifest_url}"
+            EOF
+            )          
           else
             export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${github.event.inputs.LOCAL_MANIFEST_BRANCH} local_manifests"
           fi

diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml
@@ -188,7 +188,12 @@ jobs:
           if [[ "${{ github.event.inputs.LOCAL_MANIFEST }}" =~ \.xml(/)?$ ]]; then
             local_manifest_url="${{ github.event.inputs.LOCAL_MANIFEST }}"
             local_manifest_url="${local_manifest_url%/}"  # remove trailing slash if it exists
-            export LOCAL_MANIFEST='mkdir -p .repo/local_manifests; rm -rf .repo/local_manifests/*; curl -o .repo/local_manifests/local_manifest.xml '"${local_manifest_url}"
+            export LOCAL_MANIFEST=$(cat <<EOF
+            mkdir -p .repo/local_manifests && \
+            rm -rf .repo/local_manifests/* && \
+            curl -o .repo/local_manifests/local_manifest.xml "${local_manifest_url}"
+            EOF
+            )          
           else
             export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${github.event.inputs.LOCAL_MANIFEST_BRANCH} local_manifests"
           fi

diff --git a/.github/workflows/twrp-legacy.yml b/.github/workflows/twrp-legacy.yml
@@ -101,7 +101,12 @@ jobs:
           if [[ "${{ github.event.inputs.LOCAL_MANIFEST }}" =~ \.xml(/)?$ ]]; then
             local_manifest_url="${{ github.event.inputs.LOCAL_MANIFEST }}"
             local_manifest_url="${local_manifest_url%/}"  # remove trailing slash if it exists
-            export LOCAL_MANIFEST='mkdir -p .repo/local_manifests; rm -rf .repo/local_manifests/*; curl -o .repo/local_manifests/local_manifest.xml '"${local_manifest_url}"
+            export LOCAL_MANIFEST=$(cat <<EOF
+            mkdir -p .repo/local_manifests && \
+            rm -rf .repo/local_manifests/* && \
+            curl -o .repo/local_manifests/local_manifest.xml "${local_manifest_url}"
+            EOF
+            )          
           else
             export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${github.event.inputs.LOCAL_MANIFEST_BRANCH} local_manifests"
           fi

diff --git a/.github/workflows/twrp.yml b/.github/workflows/twrp.yml
@@ -101,7 +101,12 @@ jobs:
           if [[ "${{ github.event.inputs.LOCAL_MANIFEST }}" =~ \.xml(/)?$ ]]; then
             local_manifest_url="${{ github.event.inputs.LOCAL_MANIFEST }}"
             local_manifest_url="${local_manifest_url%/}"  # remove trailing slash if it exists
-            export LOCAL_MANIFEST='mkdir -p .repo/local_manifests; rm -rf .repo/local_manifests/*; curl -o .repo/local_manifests/local_manifest.xml '"${local_manifest_url}"
+            export LOCAL_MANIFEST=$(cat <<EOF
+            mkdir -p .repo/local_manifests && \
+            rm -rf .repo/local_manifests/* && \
+            curl -o .repo/local_manifests/local_manifest.xml "${local_manifest_url}"
+            EOF
+            )          
           else
             export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${github.event.inputs.LOCAL_MANIFEST_BRANCH} local_manifests"
           fi