builder - Use the custom branch/repo on fresh checkouts

Move the __builder_repo and __builder_branch checks outside of the if/else so it gets run after an initial chroot RetroPie-Setup checkout.
schiele · Oct 1, 2024 · c384f1b · c384f1b
1 parent d0f5bc7
commit c384f1b
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/scriptmodules/admin/builder.sh b/scriptmodules/admin/builder.sh
@@ -131,16 +131,17 @@ function chroot_build_builder() {
                     git branch -D builder-branch
                     git remote remove builder
                 fi
-            "
-            # if we have a __builder_repo and __builder_branch set, check out the branch and use that
-            if [[ -n "$__builder_repo" && "$__builder_branch" ]]; then
-                rp_callModule image chroot "$chroot_dir" bash -c "
-                    cd ~/RetroPie-Setup
-                    git remote add builder $__builder_repo
-                    git fetch -q builder
-                    git checkout builder/$__builder_branch -b builder-branch
-                    "
-            fi
+                "
+        fi
+
+        # if we have a __builder_repo and __builder_branch set, check out the branch and use that
+        if [[ -n "$__builder_repo" && "$__builder_branch" ]]; then
+            rp_callModule image chroot "$chroot_dir" bash -c "
+                cd ~/RetroPie-Setup
+                git remote add builder $__builder_repo
+                git fetch -q builder
+                git checkout builder/$__builder_branch -b builder-branch
+                "
         fi
 
         for platform in $platforms; do