Handle correctly variant using argparse switches, regression from #151

guysoft · Feb 2, 2022 · e4999c3 · e4999c3
1 parent 599662e
commit e4999c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/nightly_build_scripts/custompios_nightly_build b/src/nightly_build_scripts/custompios_nightly_build
@@ -59,7 +59,7 @@ pushd "${DIST_PATH}"
             echo "Error: you must have \${CUSTOM_PI_OS_PATH} to generate a rpi-imager snipplet"
             exit 1
         fi
-        source "${CUSTOM_PI_OS_PATH}/config"
+        source "${CUSTOM_PI_OS_PATH}/config" "${WORKSPACE_SUFFIX}"
         "${CUSTOM_PI_OS_PATH}/make_rpi-imager-snipplet.py" --rpi_imager_url "${RPI_IMAGER_URL}" -- "${WORKSPACE_SUFFIX}"
     fi
 

diff --git a/src/release b/src/release
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set +x
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$DIR/argparse.bash" || exit 1
@@ -21,7 +22,7 @@ if [ -z "${CUSTOM_PI_OS_PATH}" ];then
 fi
 
 # source "${DIST_PATH}/config"
-source "${CUSTOM_PI_OS_PATH}/config"
+source "${CUSTOM_PI_OS_PATH}/config" "${WORKSPACE_SUFFIX}"
 
 FILENAME=$(basename `ls . |  grep -e .img$ -e .raw$ | tail -n 1`)