Update L1A test script

Author: mcduffie

cwl/l1a_package.cwl

@@ -66,7 +66,7 @@ $graph:
 
   requirements:
     DockerRequirement:
-      dockerPull: unity-sds/sounder_sips_l1a_pge:r0.1.0
+      dockerPull: unity-ads/sounder_sips_l1a_pge:r0.1.0
 
   arguments: [
     "$(runtime.outdir)/processed_notebook.ipynb",

install/build_common.sh

@@ -13,6 +13,7 @@ src_dir=$1
 
 if [ -z "$src_dir" ]; then
     usage
+    exit 1
 fi
 
 # PGE common directories

test/common/copy_l1a_input.sh

@@ -1,10 +1,23 @@
 #!/bin/bash
 
+usage () {
+    echo "Usage:"
+    echo "$0 <l0_file_directory>"
+    exit 1
+}
+
+l0_in_dir=$1
+
+if [ -z "$l0_in_dir" ]; then
+    usage
+    exit 1
+fi
+
 # Source common variables
-source $(dirname $0)/common/setup_env.sh $(dirname $0)
+source $(dirname $0)/setup_env.sh $(dirname $0)
 
 # Copy input L0 files from SPSS source tree
-. $(dirname $0)/common/copy_l1a_input.sh
+cp -av $l0_in_dir/* $PGE_IN_DIR
 
 cwl_path=$(realpath "$(dirname $0)"/../cwl)
 
@@ -20,6 +33,6 @@ cwltool \
     --static_dir ${PGE_STATIC_DIR} \
     --start_datetime $(grep start_datetime ${cwl_path}/l1a_package.yml | awk '{print $2}' | sed 's/\"//g') \
     --end_datetime $(grep end_datetime ${cwl_path}/l1a_package.yml | awk '{print $2}' | sed 's/\"//g') \
-    $* |& tee ${PGE_OUT_DIR}/cwltool.log
+    |& tee ${PGE_OUT_DIR}/cwltool.log
 
 echo "Output available at: $PGE_OUT_DIR"

test/common/copy_l1b_input.sh

@@ -46,11 +46,11 @@ if [ -z "$use_temp" ]; then
 fi
 
 # Include variables from .env file so we have $DOCKER_TAG available
-env_file=$(realpath $base_dir/../../.env)
+env_file=$(realpath $base_dir/../.env)
 . $env_file
 
 # Find static files location
-lcl_static_dir=$(realpath $base_dir/../../static)
+lcl_static_dir=$(realpath $base_dir/../static)
 if [ -z "$PGE_STATIC_DIR" ] && [ -e "$lcl_static_dir" ]; then
     PGE_STATIC_DIR=$lcl_static_dir
 else