Export the previous variable and fix the rm command

sounddrill31 · Aug 4, 2024 · 1823de1 · 1823de1
1 parent 6ef0b2b
commit 1823de1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -150,8 +150,8 @@ jobs:
         #copy from here
           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_url="${local_manifest_url%/}"  # remove trailing slash if it exists
+          export LOCAL_MANIFEST=$(mkdir -p .repo/local_manifests && rm -rf .repo/local_manifests/* || true && curl -o .repo/local_manifests/local_manifest.xml "${local_manifest_url}")     
             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
@@ -187,8 +187,8 @@ 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_url="${local_manifest_url%/}"  # remove trailing slash if it exists
+          export LOCAL_MANIFEST=$(mkdir -p .repo/local_manifests && rm -rf .repo/local_manifests/* || true && curl -o .repo/local_manifests/local_manifest.xml "${local_manifest_url}")     
           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
@@ -100,8 +100,8 @@ 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_url="${local_manifest_url%/}"  # remove trailing slash if it exists
+            export LOCAL_MANIFEST=$(mkdir -p .repo/local_manifests && rm -rf .repo/local_manifests/* || true && curl -o .repo/local_manifests/local_manifest.xml "${local_manifest_url}")
           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
@@ -100,8 +100,8 @@ 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_url="${local_manifest_url%/}"  # remove trailing slash if it exists
+          export LOCAL_MANIFEST=$(mkdir -p .repo/local_manifests && rm -rf .repo/local_manifests/* || true && curl -o .repo/local_manifests/local_manifest.xml "${local_manifest_url}")     
           else
             export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${github.event.inputs.LOCAL_MANIFEST_BRANCH} local_manifests"
           fi