Skip to content

Commit 9ea4058

Browse files
committed
Fix order of instructions
1 parent c11a42e commit 9ea4058

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

deploy_dqmgui.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ EUID_USER_DQM=40454
2626
# Main directory we're installing into.
2727
INSTALLATION_DIR=/data/srv
2828

29-
# Where ROOT will be installed
30-
ROOT_INSTALLATION_DIR=$INSTALLATION_DIR/root
31-
3229
# This scipt's directory
3330
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
3431

@@ -37,15 +34,7 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
3734
# based on the version of the package (DMWM and DQMGUI).
3835
source $SCRIPT_DIR/config.sh
3936

40-
## Internal temporary paths
4137
TMP_BASE_PATH=/tmp
42-
ROOT_TMP_DIR="${TMP_BASE_PATH}/root"
43-
ROOT_TMP_BUILD_DIR="${TMP_BASE_PATH}/root_build"
44-
ROTOGLUP_TMP_DIR="${TMP_BASE_PATH}/rotoglup"
45-
CLASSLIB_TMP_DIR="${TMP_BASE_PATH}/classlib-3.1.3"
46-
DMWM_TMP_DIR="${TMP_BASE_PATH}/dmwm"
47-
NUMERIC_TMP_DIR="${TMP_BASE_PATH}/numeric"
48-
DQMGUI_TMP_DIR="${TMP_BASE_PATH}/dqmgui"
4938

5039
# Preliminary checks to do before installing the GUI
5140
preliminary_checks() {
@@ -597,6 +586,17 @@ for ARGUMENT in "$@"; do
597586
eval "$KEY=$VALUE"
598587
done
599588

589+
## Internal temporary paths
590+
ROOT_TMP_DIR="${TMP_BASE_PATH}/root"
591+
ROOT_TMP_BUILD_DIR="${TMP_BASE_PATH}/root_build"
592+
ROTOGLUP_TMP_DIR="${TMP_BASE_PATH}/rotoglup"
593+
CLASSLIB_TMP_DIR="${TMP_BASE_PATH}/classlib-3.1.3"
594+
DMWM_TMP_DIR="${TMP_BASE_PATH}/dmwm"
595+
NUMERIC_TMP_DIR="${TMP_BASE_PATH}/numeric"
596+
DQMGUI_TMP_DIR="${TMP_BASE_PATH}/dqmgui"
597+
# Where ROOT will be installed
598+
ROOT_INSTALLATION_DIR=$INSTALLATION_DIR/root
599+
600600
# Go to the installation directory
601601
cd $INSTALLATION_DIR/
602602

0 commit comments

Comments
 (0)