further improvements
This commit is contained in:
@@ -205,7 +205,7 @@ run_steps() {
|
||||
echo " Building $app..."
|
||||
IFS=',' read -ra step_list <<< "$steps"
|
||||
for step in "${step_list[@]}"; do
|
||||
step=$(echo "$step" | xargs)
|
||||
step=$(echo "$step" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
|
||||
echo " Running: $step"
|
||||
eval "$step"
|
||||
done
|
||||
@@ -272,14 +272,21 @@ process_conf() {
|
||||
fi
|
||||
|
||||
local key="${line%%=*}"
|
||||
local value="${line#*=}"
|
||||
value=$(eval echo "$value")
|
||||
local raw_value="${line#*=}"
|
||||
|
||||
# Steps are stored raw so quotes and variables expand correctly at eval time
|
||||
if [ "$key" = "steps" ]; then
|
||||
steps="$raw_value"
|
||||
continue
|
||||
fi
|
||||
|
||||
local value
|
||||
value=$(eval echo "$raw_value")
|
||||
|
||||
case "$key" in
|
||||
git) git_url="$value" ;;
|
||||
wget) wget_url="$value" ;;
|
||||
install) install_path="$value" ;;
|
||||
steps) steps="$value" ;;
|
||||
version) version="$value" ;;
|
||||
desktop) desktop="$value" ;;
|
||||
gui) gui="$value" ;;
|
||||
|
||||
Reference in New Issue
Block a user