Fix check order during root installation

cms-DQM · Jul 16, 2024 · ef63d73 · ef63d73
1 parent db0ab8a
commit ef63d73
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/deploy_dqmgui.sh b/deploy_dqmgui.sh
@@ -610,23 +610,23 @@ install_jsroot() {
 # Extract the ROOT tar to a tmp folder for compilation
 install_root() {
     if source "$ROOT_INSTALLATION_DIR/bin/thisroot.sh"; then
-        echo "INFO: ROOT installation found, not re-compiling ROOT"
+        echo "INFO: ROOT installation found, not installing ROOT"
         return
     fi
     mkdir -p $ROOT_TMP_DIR
     tar -xzf "$SCRIPT_DIR/root/root.tar.gz" -C "${ROOT_TMP_DIR}"
 }
 
 compile_root() {
+    if source "$ROOT_INSTALLATION_DIR/bin/thisroot.sh"; then
+        echo "INFO: ROOT installation found, not re-compiling ROOT"
+        return
+    fi
     if [ ! -d $ROOT_TMP_DIR ]; then
         echo "ERROR: ROOT source was not found in $ROOT_TMP_DIR"
         exit 1
     fi
 
-    if source "$ROOT_INSTALLATION_DIR/bin/thisroot.sh"; then
-        echo "INFO: ROOT installation found, not re-compiling ROOT"
-        return
-    fi
     mkdir -p $ROOT_TMP_BUILD_DIR
     cd $ROOT_TMP_BUILD_DIR
     cmake -DCMAKE_INSTALL_PREFIX=$ROOT_INSTALLATION_DIR $ROOT_TMP_DIR/root -DPYTHON_EXECUTABLE="$(which python${PYTHON_VERSION})" -Dtesting=OFF -Dbuiltin_gtest=OFF -Dclad=OFF