From 9ea405877f36d12add04c84acc4dfd14c7f6e117 Mon Sep 17 00:00:00 2001 From: Dimitris Papagiannis Date: Tue, 19 Dec 2023 11:02:53 +0100 Subject: [PATCH] Fix order of instructions --- deploy_dqmgui.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy_dqmgui.sh b/deploy_dqmgui.sh index c43c964..06746aa 100755 --- a/deploy_dqmgui.sh +++ b/deploy_dqmgui.sh @@ -26,9 +26,6 @@ EUID_USER_DQM=40454 # Main directory we're installing into. INSTALLATION_DIR=/data/srv -# Where ROOT will be installed -ROOT_INSTALLATION_DIR=$INSTALLATION_DIR/root - # This scipt's directory SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) @@ -37,15 +34,7 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) # based on the version of the package (DMWM and DQMGUI). source $SCRIPT_DIR/config.sh -## Internal temporary paths TMP_BASE_PATH=/tmp -ROOT_TMP_DIR="${TMP_BASE_PATH}/root" -ROOT_TMP_BUILD_DIR="${TMP_BASE_PATH}/root_build" -ROTOGLUP_TMP_DIR="${TMP_BASE_PATH}/rotoglup" -CLASSLIB_TMP_DIR="${TMP_BASE_PATH}/classlib-3.1.3" -DMWM_TMP_DIR="${TMP_BASE_PATH}/dmwm" -NUMERIC_TMP_DIR="${TMP_BASE_PATH}/numeric" -DQMGUI_TMP_DIR="${TMP_BASE_PATH}/dqmgui" # Preliminary checks to do before installing the GUI preliminary_checks() { @@ -597,6 +586,17 @@ for ARGUMENT in "$@"; do eval "$KEY=$VALUE" done +## Internal temporary paths +ROOT_TMP_DIR="${TMP_BASE_PATH}/root" +ROOT_TMP_BUILD_DIR="${TMP_BASE_PATH}/root_build" +ROTOGLUP_TMP_DIR="${TMP_BASE_PATH}/rotoglup" +CLASSLIB_TMP_DIR="${TMP_BASE_PATH}/classlib-3.1.3" +DMWM_TMP_DIR="${TMP_BASE_PATH}/dmwm" +NUMERIC_TMP_DIR="${TMP_BASE_PATH}/numeric" +DQMGUI_TMP_DIR="${TMP_BASE_PATH}/dqmgui" +# Where ROOT will be installed +ROOT_INSTALLATION_DIR=$INSTALLATION_DIR/root + # Go to the installation directory cd $INSTALLATION_DIR/