Update step configuration handling

This commit is contained in:
2022-01-11 20:37:24 +00:00
parent 51a3a8b593
commit 06f960d96d

View File

@@ -18,34 +18,44 @@ dockerDnsEntry=
# Get script working directory # Get script working directory
# (when called from a different directory) # (when called from a different directory)
WDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >>/dev/null 2>&1 && pwd)" WDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >>/dev/null 2>&1 && pwd)"
CONFIG_FILE="$WDIR/${toolName}.cfg" APTOPT=
CONFIG_FILE_DEFAULT="${CONFIG_FILE}.example" CONFIG=0
SCRIPT_FILE=$(basename -- $0)
SCRIPT_NAME=${SCRIPT_FILE%%.*}
CONFIG_FILE_NAME="${SCRIPT_NAME}.cfg"
CONFIG_FILE_TEMPLATE="$WDIR/${CONFIG_FILE_NAME}.example"
step_config() { step_config() {
if [ ! -s "$CONFIG_FILE" ] && [ ! -s "$CONFIG_FILE_DEFAULT" ] ; then ## Called once before executing steps.
echoerr " [E] No configuration \"$CONFIG_FILE_DEFAULT\" or \"$CONFIG_FILE\" found" ## e.g. to source a config file manually:
exit 1; #. "$CONFIG_FILE"
fi
if [ -s "$CONFIG_FILE" ] ; then ## or to use sequencer api with global config file:
. "$CONFIG_FILE" initSeqConfig "$CONFIG_FILE_NAME" "$CONFIG_FILE_TEMPLATE"
## or to use sequencer api with profile config file support:
#initSeqConfig -p "$SCRIPT_NAME" "$CONFIG_FILE_TEMPLATE"
if [ $? -eq 0 ] ; then
CONFIG=1
else else
echoerr " [W] User configuration \"$CONFIG_FILE\" not found. Using \"$CONFIG_FILE_DEFAULT\"" # End if no configuration file exists
. "$CONFIG_FILE_DEFAULT" [ $DRY -eq 0 ] && return -1
fi fi
## Apt cmdline option to suppress user interaction
[ $QUIET -ne 0 ] && APTOPT="-y"
dockerDnsEntry="DOCKER_OPTS=\"--dns $dockerDns1 --dns $dockerDns2\"" dockerDnsEntry="DOCKER_OPTS=\"--dns $dockerDns1 --dns $dockerDns2\""
## Return of non zero value will abort the sequence
return 0
} }
step_1_info() { echo "Install Docker dependencies"; } step_1_info() { echo "Install Docker dependencies"; }
step_1_alias() { ALIAS="install"; } step_1_alias() { ALIAS="install"; }
step_1() { step_1() {
local aptOption=
exe apt update exe apt update
if [ $QUIET -ne 0 ] ; then exe apt install $dockerDeps $APTOPT
aptOption="-y"
else
aptOption=""
fi
exe apt install $dockerDeps $aptOption
endReturn -o $? "Docker dependencies installation failed" endReturn -o $? "Docker dependencies installation failed"
} }