Skip to content

Commit

Permalink
Split step, remove unnecessary check
Browse files Browse the repository at this point in the history
  • Loading branch information
nothingface0 committed Feb 20, 2024
1 parent 39c65d9 commit 1178548
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions deploy_dqmgui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
# Stop at any non-zero return and display all commands.
set -ex

### Constants

# The EUID of the authorized user to run the script.
EUID_USER_DQM=40454

# Main directory we're installing into.
INSTALLATION_DIR=/data/srv

Expand All @@ -44,12 +39,6 @@ preliminary_checks() {
exit 1
fi

# Make sure only the dqm user can run our script
if [[ $EUID -ne $EUID_USER_DQM ]]; then
echo "This script must be run as dqm" 1>&2
exit 1
fi

# Make sure you can only run the script on the DQM servers
case $HOSTNAME in
dqmsrv-c2a06-07-01 | dqmsrv-c2a06-08-01 | dqmfu-c2b02-46-01 | dpapagia-dev-vm*)
Expand Down Expand Up @@ -276,11 +265,14 @@ install_gil_numeric() {
mv "$NUMERIC_TMP_DIR" "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/external/src/boost/gil/extension/numeric"
}

install_dmwm() {
# Split DMWM installation to allow a user apply patches
extract_dmwm() {
# Temporary directory to clone DMWM deployment scripts into

mkdir -p $DMWM_TMP_DIR
tar -xzf "$SCRIPT_DIR/dmwm/dmwm.tar.gz" -C "${TMP_BASE_PATH}"
}

install_dmwm() {
# Move dqmgui-related scripts from DMWM to the config folder
rm -rf "$INSTALLATION_DIR/$DMWM_GIT_TAG/config/dqmgui" # Cleanup dir if exists
mv "$DMWM_TMP_DIR/dqmgui" "$INSTALLATION_DIR/$DMWM_GIT_TAG/config/dqmgui"
Expand Down Expand Up @@ -548,6 +540,7 @@ declare -a installation_steps=(preliminary_checks
install_rotoglup
install_classlib
compile_classlib
extract_dmwm
install_dmwm
install_root
compile_root
Expand Down

0 comments on commit 1178548

Please sign in to comment.