Merge branch 'fix-restore-fetch-template' into '2.8.4-DEVELOPMENT'

fix restore fetch template error

See merge request !1651

shared/workspaces/alembic/versions/templates/restore_cms/fetch_sh_2.8.3.txt

@@ -17,7 +17,7 @@ if [ ! -z "$PREV_PROCESSING_DIR" ] && [ -d "../$PREV_PROCESSING_DIR/rawdata/" ]
 else
     # Run the product fetcher
     cd rawdata/
-    $SBIN_PATH/productfetcher --product-locator $1
+    $SBIN_PATH/productfetcher --product-locator $1 --product-locator $2
     cd ../
 fi
 

shared/workspaces/alembic/versions/templates/restore_cms/lustre_only_deliver_sh_2.7.txt

@@ -6,5 +6,4 @@ export HOME={{spool_dir}}
 SBIN_PATH=/lustre/aoc/cluster/pipeline/$CAPO_PROFILE/workspaces/sbin
 
 mv $2/working/{{sdmId}}.ms $2/products/
-$SBIN/deliver -p $2/products --prefix $1
-
+$SBIN_PATH/deliver -p $2/products --prefix $1

shared/workspaces/alembic/versions/templates/std_restore_imaging/fetch_sh_2.8.3.txt

@@ -17,7 +17,7 @@ if [ ! -z "$PREV_PROCESSING_DIR" ] && [ -d "../$PREV_PROCESSING_DIR/rawdata/" ]
 else
     # Run the product fetcher
     cd rawdata/
-    $SBIN_PATH/productfetcher --product-locator $1
+    $SBIN_PATH/productfetcher --product-locator $1 --product-locator $2
     cd ../
 fi
 

shared/workspaces/alembic/versions/templates/std_restore_imaging/lustre_only_deliver_sh_2.7.txt

@@ -5,6 +5,4 @@ export HOME={{spool_dir}}
 
 SBIN_PATH=/lustre/aoc/cluster/pipeline/$CAPO_PROFILE/workspaces/sbin
 
-$SBIN/deliver -p $2/products --prefix $1
-
-
+$SBIN_PATH/deliver -p $2/products --prefix $1