From c65efbc8992a0194e58580e5a530eb01afad2851 Mon Sep 17 00:00:00 2001
From: SoundDrill31 <84176052+sounddrill31@users.noreply.github.com>
Date: Mon, 5 Aug 2024 09:02:23 +0530
Subject: [PATCH] Apply fix properly everywhere

---
 .github/workflows/main.yml        | 2 +-
 .github/workflows/selfhosted.yml  | 8 ++++----
 .github/workflows/twrp-legacy.yml | 2 +-
 .github/workflows/twrp.yml        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 134372d5..99ba5275 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -153,7 +153,7 @@ jobs:
             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"
+            export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${{github.event.inputs.LOCAL_MANIFEST_BRANCH}} local_manifests"
           fi
 
         echo "Building on ${{ github.event.inputs.BASE_PROJECT }} project"
diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml
index 1e885e50..2b5fcabc 100644
--- a/.github/workflows/selfhosted.yml
+++ b/.github/workflows/selfhosted.yml
@@ -36,11 +36,11 @@ on:
       LOCAL_MANIFEST:
         description: "Personal local manifest [repository or raw]:"
         required: true
-        default: 'https://github.com/iamrh1819/local_manifests'
+        default: 'https://github.com/sounddrill31/local_manifests_oxygen'
       LOCAL_MANIFEST_BRANCH:
         description: "Personal local manifest's branch:"
         required: false
-        default: 'A13'
+        default: 'lineage-21-qpr3'
       DEVICE_NAME:
         description: "Device's codename:"
         required: true
@@ -190,7 +190,7 @@ jobs:
             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"
+            export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${{github.event.inputs.LOCAL_MANIFEST_BRANCH}} .repo/local_manifests"
           fi
 
         echo "Building on ${{ github.event.inputs.BASE_PROJECT }} project"
@@ -219,7 +219,7 @@ jobs:
         echo "Displaying Local Manifests"
         if [[ -z "${{ secrets.DISPLAY_FALSE }}" ]]; then
           $LOCAL_MANIFEST
-          cat local_manifests/*.xml
+          cat .repo/local_manifests/*.xml
         else
           echo "Displaying is disabled through secrets."
         fi
diff --git a/.github/workflows/twrp-legacy.yml b/.github/workflows/twrp-legacy.yml
index 5278504a..ae36da77 100644
--- a/.github/workflows/twrp-legacy.yml
+++ b/.github/workflows/twrp-legacy.yml
@@ -103,7 +103,7 @@ jobs:
             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"
+            export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${{github.event.inputs.LOCAL_MANIFEST_BRANCH}} local_manifests"
           fi
 
         echo "Building on ${{ github.event.inputs.BASE_PROJECT }} project"
diff --git a/.github/workflows/twrp.yml b/.github/workflows/twrp.yml
index b781e3b6..6a295a01 100644
--- a/.github/workflows/twrp.yml
+++ b/.github/workflows/twrp.yml
@@ -103,7 +103,7 @@ jobs:
             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"
+            export LOCAL_MANIFEST="git clone ${{ github.event.inputs.LOCAL_MANIFEST }} --depth 1 -b ${{github.event.inputs.LOCAL_MANIFEST_BRANCH}} local_manifests"
           fi
 
         echo "Building on ${{ github.event.inputs.BASE_PROJECT }} project"