scottk/secureblue
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/secureblue.git synced 2025-11-08 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor: export get_yaml_array"

Browse Source 
This reverts commit c27685fae2.

(get_yaml_array can't be used in modules since it reads from
the $RECIPE_FILE)
This commit is contained in:
ER
2023-08-13 16:15:22 +03:00
parent c27685fae2
commit 18d1b3d4cd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@@ -11,7 +11,6 @@ MODULE_DIRECTORY="/tmp/modules"
get_yaml_array() { get_yaml_array() {
readarray "$1" < <(yq -o=j -I=0 "$2" "$RECIPE_FILE" ) readarray "$1" < <(yq -o=j -I=0 "$2" "$RECIPE_FILE" )
} }
export -f get_yaml_array
# Automatically determine which Fedora version we're building. # Automatically determine which Fedora version we're building.
FEDORA_VERSION="$(grep -Po '(?<=VERSION_ID=)\d+' /usr/lib/os-release)" FEDORA_VERSION="$(grep -Po '(?<=VERSION_ID=)\d+' /usr/lib/os-release)"

3
modules/script/script.sh
View File

@@ -3,9 +3,10 @@
# Tell build process to exit if there are any errors. # Tell build process to exit if there are any errors.
set -oue pipefail set -oue pipefail
readarray RUN < <(yq -o=j -I=0 '.run[]' "$1" )
cd "$CONFIG_DIRECTORY/scripts" cd "$CONFIG_DIRECTORY/scripts"
get_yaml_array RUN '.run[]'
for CMD in "${RUN[@]}"; do for CMD in "${RUN[@]}"; do
echo "Running command: $CMD" echo "Running command: $CMD"
$CMD $CMD