From 17450f1a2f0018402d47a17077e7f025f08c6e83 Mon Sep 17 00:00:00 2001
From: Dimitris Papagiannis <d.papag.a@gmail.com>
Date: Thu, 16 Nov 2023 18:06:35 +0100
Subject: [PATCH] Fix order of commands, update readme

---
 README.md        | 11 ++++++-----
 deploy_dqmgui.sh | 13 +++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 5d4c85b..4f5b67d 100644
--- a/README.md
+++ b/README.md
@@ -91,11 +91,12 @@ This procedure has been tested on a RHEL8 Openstack VM. Instructions below are p
 
   a. Download the latest build artifact and copy it to the machine you want to install it to:
 
-    ```bash
-    curl -L https://github.com/cms-DQM/dqmgui_prod_deployment/releases/download/latest/dqmgui_installation_package.tar.gz --output dqmgui_installation_package.tar.gz
-    scp dqmgui_installation_package.tar.gz root@<VM machine>:/tmp/
-    ```
-    OR
+  ```bash
+  curl -L https://github.com/cms-DQM/dqmgui_prod_deployment/releases/download/latest/dqmgui_installation_package.tar.gz --output dqmgui_installation_package.tar.gz
+  scp dqmgui_installation_package.tar.gz root@<VM machine>:/tmp/
+  ```
+
+  OR
 
   b. Download all the required files yourself:
 
diff --git a/deploy_dqmgui.sh b/deploy_dqmgui.sh
index 432e606..95a5960 100755
--- a/deploy_dqmgui.sh
+++ b/deploy_dqmgui.sh
@@ -395,12 +395,6 @@ install_dqmgui() {
     mv $DQMGUI_TMP_DIR "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/cms/dqmgui/$DQMGUI_GIT_TAG/128"
 
     mkdir -p "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/cms/dqmgui/$DQMGUI_GIT_TAG/128/data"
-    mkdir -p "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/venv/data/" # Needed for DQMGUI templates
-    if [ -d "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/venv/data/templates" ]; then
-        rm -rf "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/venv/data/templates"
-    fi
-
-    mv "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/cms/dqmgui/$DQMGUI_GIT_TAG/128/src/templates" "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/venv/data/templates"
 
     if [ ! -L "$INSTALLATION_DIR/$DMWM_GIT_TAG/apps/dqmgui" ]; then
         echo "DEBUG: Creating link $INSTALLATION_DIR/$DMWM_GIT_TAG/sw/cms/dqmgui/$DQMGUI_GIT_TAG <-- $INSTALLATION_DIR/$DMWM_GIT_TAG/apps/dqmgui"
@@ -410,6 +404,13 @@ install_dqmgui() {
     # Create python venv for all python "binaries" and webserver
     _create_python_venv
 
+    mkdir -p "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/venv/data/" # Needed for DQMGUI templates
+    if [ -d "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/venv/data/templates" ]; then
+        rm -rf "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/venv/data/templates"
+    fi
+
+    mv "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/cms/dqmgui/$DQMGUI_GIT_TAG/128/src/templates" "$INSTALLATION_DIR/$DMWM_GIT_TAG/sw/venv/data/templates"
+
     # Create files needed by manage script for env variables
     _create_env_and_init_sh