reorganize deploy script

bin/deploy

@@ -30,11 +30,10 @@ MPLCONFIGDIR="/tmp"
 SPEECH2TEXT_MEM="12G"
 SPEECH2TEXT_CPUS_PER_TASK="6"
 
-
 # --------------------------------------------------
-# Deploy as an Open OnDemand app
+# Deploy as a module
 
-SCRIPT="$SCRIPT_DIR"/deploy-data/ood/template/script.sh
+SCRIPT="$SCRIPT_DIR"/deploy-data/module/module.lua
 
 sed -i "s|<VERSION>|$VERSION|g" $SCRIPT
 sed -i "s|<SPEECH2TEXT>|$SPEECH2TEXT|g" $SCRIPT
@@ -48,14 +47,13 @@ sed -i "s|<MPLCONFIGDIR>|$MPLCONFIGDIR|g" $SCRIPT
 sed -i "s|<SPEECH2TEXT_MEM>|$SPEECH2TEXT_MEM|g" $SCRIPT
 sed -i "s|<SPEECH2TEXT_CPUS_PER_TASK>|$SPEECH2TEXT_CPUS_PER_TASK|g" $SCRIPT
 
-# Copy the Open OnDemand scripts to the system deployment location
-# https://osc.github.io/ood-documentation/release-1.8/app-development/tutorials-interactive-apps/add-jupyter/deploy.html
-sudo cp -r "$SCRIPT_DIR"/deploy-data/ood/ /var/www/ood/apps/sys/speech2text # FIXME: wrong path
+# Copy 
+cp "$SCRIPT" /appl/manual_installations/modules/speech2text/"$VERSION".lua
 
 # --------------------------------------------------
-# Deploy as a module
+# Deploy as an Open OnDemand app
 
-SCRIPT="$SCRIPT_DIR"/deploy-data/module/module.lua
+SCRIPT="$SCRIPT_DIR"/deploy-data/ood/template/script.sh
 
 sed -i "s|<VERSION>|$VERSION|g" $SCRIPT
 sed -i "s|<SPEECH2TEXT>|$SPEECH2TEXT|g" $SCRIPT
@@ -69,9 +67,6 @@ sed -i "s|<MPLCONFIGDIR>|$MPLCONFIGDIR|g" $SCRIPT
 sed -i "s|<SPEECH2TEXT_MEM>|$SPEECH2TEXT_MEM|g" $SCRIPT
 sed -i "s|<SPEECH2TEXT_CPUS_PER_TASK>|$SPEECH2TEXT_CPUS_PER_TASK|g" $SCRIPT
 
-# Copy 
-cp "$SCRIPT" /appl/manual_installations/modules/speech2text/"$VERSION".lua
-
 # Deploy to Github for ondemand installation
 REPO_URL="https://github.com/AaltoSciComp/speech2text-ood-ansible.git"
 TEMP_DIR=$(mktemp -d)