From c27685fae21ca767c47c63665a03cae55c47fc13 Mon Sep 17 00:00:00 2001 From: ER Date: Sun, 13 Aug 2023 16:12:57 +0300 Subject: [PATCH] refactor: export get_yaml_array --- build.sh | 1 + modules/script/script.sh | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 29a1798..3125c8d 100644 --- a/build.sh +++ b/build.sh @@ -11,6 +11,7 @@ MODULE_DIRECTORY="/tmp/modules" get_yaml_array() { readarray "$1" < <(yq -o=j -I=0 "$2" "$RECIPE_FILE" ) } +export -f get_yaml_array # Automatically determine which Fedora version we're building. FEDORA_VERSION="$(grep -Po '(?<=VERSION_ID=)\d+' /usr/lib/os-release)" diff --git a/modules/script/script.sh b/modules/script/script.sh index d71a78a..c5ac89f 100644 --- a/modules/script/script.sh +++ b/modules/script/script.sh @@ -3,10 +3,9 @@ # Tell build process to exit if there are any errors. set -oue pipefail -readarray RUN < <(yq -o=j -I=0 '.run[]' "$1" ) - cd "$CONFIG_DIRECTORY/scripts" +get_yaml_array RUN '.run[]' for CMD in "${RUN[@]}"; do echo "Running command: $CMD" $CMD