From 1178548a926eaf30cb83fee9f3e20658ad57459d Mon Sep 17 00:00:00 2001
From: Dimitris Papagiannis <d.papag.a@gmail.com>
Date: Tue, 20 Feb 2024 16:28:01 +0100
Subject: [PATCH] Split step, remove unnecessary check

---
 deploy_dqmgui.sh | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/deploy_dqmgui.sh b/deploy_dqmgui.sh
index 20e2d36..3de647b 100755
--- a/deploy_dqmgui.sh
+++ b/deploy_dqmgui.sh
@@ -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
 
@@ -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*)
@@ -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"
@@ -548,6 +540,7 @@ declare -a installation_steps=(preliminary_checks
     install_rotoglup
     install_classlib
     compile_classlib
+    extract_dmwm
     install_dmwm
     install_root
     compile_root