From c13b011d6c2fb0b8e22d306a4e108547df9a1f3a Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Tue, 9 Jul 2024 14:20:37 +0100
Subject: [PATCH] changes to run script to work with new resources structure

---
 configs/docker/run/launchAndRunDockerEWS.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/configs/docker/run/launchAndRunDockerEWS.sh b/configs/docker/run/launchAndRunDockerEWS.sh
index 96565aa..0ea7740 100755
--- a/configs/docker/run/launchAndRunDockerEWS.sh
+++ b/configs/docker/run/launchAndRunDockerEWS.sh
@@ -11,8 +11,8 @@ run_config='not_set'
 rundate=$(date '+%Y%m%d') # default today
 
 
-SHORT=p:c:s:l:h
-LONG=component:,config:,rundate:,noupload::,islive::,clearup::,loglevel::,help
+SHORT=p:s:c:d:l:h
+LONG=component:,sys_config:,run_config:,rundate:,noupload::,islive::,clearup::,loglevel::,help
 OPTS=$(getopt -a --options $SHORT --longoptions $LONG -- "$@")
 echo $OPTS
 eval set -- "$OPTS"
@@ -24,7 +24,7 @@ do
       component="$2"
       shift 2
       ;;
-    -sc | --sys_config )
+    -s | --sys_config )
       sys_config="$2"
       shift 2
       ;;
@@ -32,7 +32,7 @@ do
       run_config="$2"
       shift 2
       ;;
-    -s | --rundate )
+    -d | --rundate )
       rundate="$2"
       shift 2
       ;;
@@ -87,7 +87,7 @@ else
 fi
 
 function run_coordinator() {
-    printf "component: %s\nconfig: %s\nrundate: %s\n" "$component" "$sys_config" "$run_config" "$rundate"
+    printf "component: %s\nsys_config: %s\nrun_config: %s\nrundate: %s\n" "$configs" "$sys_config" "$run_config" "$rundate"
     printf "optional args:\n%s\n" "$upload $islive $clearup"
     config_base=$(basename $run_config)
     printf "%s\n" $config_base
@@ -105,7 +105,7 @@ function run_coordinator() {
     "$component_script" \
     -sc "$sys_config" \
     -c "$run_config" \
-    -s "$rundate" \
+    -d "$rundate" \
     -l "$loglevel" \
     $upload \
     $islive \
-- 
GitLab