Merge pull request #7 from bclarkx2/feature/repo-branch

Checkout branch if specified
bclarkx2 · Jun 13, 2020 · 1152b64 · 1152b64
2 parents 6483254 + d24a4d2
commit 1152b64
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/setup b/setup
@@ -353,12 +353,17 @@ install_repos() {
       continue
     fi
 
+    ## Check out desired branch
+    if [[ -v repo[branch ]]; then
+      run "cd ${target}; git checkout ${repo[branch]}"
+    fi
+
     # Handle submodules
     run "cd ${target}; git submodule update --init --recursive" ;
     run "cd ${target}; git submodule foreach --recursive git checkout master"
 
     # Execute any post-install script
-    if [[ -n "${repo[script]}" ]]; then
+    if [[ -v repo[script] ]]; then
       run "( cd ${target} ; ${repo[script]} )"
     fi
   done