Make sure the build type is set at the beginning

key4hep · Aug 5, 2024 · 39dd45e · 39dd45e
1 parent 029a453
commit 39dd45e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/scripts/cvmfs/setup-nightlies.sh b/scripts/cvmfs/setup-nightlies.sh
@@ -161,6 +161,21 @@ k4_local_repo() {
     echo "Some variables may have to be updated manually to point to the local installation"
 }
 
+build_type=opt
+for ((i=1; i<=$#; i++)); do
+    eval arg=\$$i
+    eval "argn=\${$((i+1))}"
+    case $arg in
+        -d)
+            build_type=dbg
+            ;;
+        -h|--help)
+            usage
+            return 0
+            ;;
+    esac
+done
+
 
 rel="latest-$build_type"
 if [[ "$1" = "-r" && -n "$2" ]]; then
@@ -185,7 +200,6 @@ if [ $? -ne 0 ]; then
   return 1
 fi
 
-build_type=opt
 for ((i=1; i<=$#; i++)); do
     eval arg=\$$i
     eval "argn=\${$((i+1))}"
@@ -221,7 +235,6 @@ for ((i=1; i<=$#; i++)); do
             fi
             ;;
         -d)
-            build_type=dbg
             ;;
         -r)
             ;;

diff --git a/scripts/cvmfs/setup-releases.sh b/scripts/cvmfs/setup-releases.sh
@@ -164,6 +164,21 @@ k4_local_repo() {
     echo "Some variables may have to be updated manually to point to the local installation"
 }
 
+build_type=opt
+for ((i=1; i<=$#; i++)); do
+    eval arg=\$$i
+    eval "argn=\${$((i+1))}"
+    case $arg in
+        -d)
+            build_type=dbg
+            ;;
+        -h|--help)
+            usage
+            return 0
+            ;;
+    esac
+done
+
 
 rel="latest-$build_type"
 if [[ "$1" = "-r" && -n "$2" ]]; then
@@ -191,19 +206,6 @@ if [ $? -ne 0 ]; then
   return 1
 fi
 
-for ((i=1; i<=$#; i++)); do
-    eval arg=\$$i
-    case $arg in
-        -h|--help)
-            usage
-            return 0
-            ;;
-        *)
-            ;;
-    esac
-done
-
-build_type=opt
 for ((i=1; i<=$#; i++)); do
     eval arg=\$$i
     eval "argn=\${$((i+1))}"
@@ -239,7 +241,6 @@ for ((i=1; i<=$#; i++)); do
             fi
             ;;
         -d)
-            build_type=dbg
             ;;
         -r)
             ;;