oi-build: always load config

Instead of only loading it if -c option was supplied
This commit is contained in:
Mads Meisner-Jensen
2022-10-01 10:20:33 +02:00
parent 1f44f1860e
commit 250932b567

View File

@@ -282,18 +282,11 @@ Without any options, info is shown for the last image built.
EOF EOF
} }
# if user does not provide config name, we default to config_name
load_config common
load_config ${config_name}
actions="" actions=""
dryrun="" dryrun=""
while [ -n "$1" ]; do while [ -n "$1" ]; do
case $1 in case $1 in
-c) config_name=$2; shift -c) config_name=$2; shift ;;
load_config common
load_config ${config_name}
;;
-r) RELEASE=$2; shift ;; -r) RELEASE=$2; shift ;;
-t) TARGET=$2; shift ;; -t) TARGET=$2; shift ;;
-p) PROFILE=$2; shift ;; -p) PROFILE=$2; shift ;;
@@ -311,6 +304,9 @@ while [ -n "$1" ]; do
shift shift
done done
load_config common
load_config ${config_name}
init_vars init_vars
echo_ok "actions = ${actions}" echo_ok "actions = ${actions}"