v3.5.0
===================================================================== --- Changes ------------------------------ - AWS (the cli wrapper) now checks for it's required variables *on run*. This accomodates scwrypts which may need to run in multiple regions, but make the downstream scwrypt responsible for adding AWS_REGION to the REQUIRED_ENV list! - Got rid of all kinds of hackiness surrounding postgres password evals between both the postgres library and the rds library --- Bug Fixes ---------------------------- - scwrypts --update now pulls tags for proper versioning
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
__CHECK_DEPENDENCIES() {
|
||||
local DEP ERROR=0
|
||||
[ ! $E ] && E=ERROR
|
||||
|
||||
DEPENDENCIES=($(echo $DEPENDENCIES | sed 's/ \+/\n/g' | sort -u))
|
||||
|
||||
@ -13,7 +14,7 @@ __CHECK_DEPENDENCY() {
|
||||
local DEPENDENCY="$1"
|
||||
[ ! $DEPENDENCY ] && return 1
|
||||
command -v $DEPENDENCY >/dev/null 2>&1 || {
|
||||
ERROR "'$1' required but not available on PATH $(__CREDITS $1)"
|
||||
$E "application '$1' "$([[ $OPTIONAL -eq 1 ]] && echo preferred || echo required)" but not available on PATH $(__CREDITS $1)"
|
||||
return 1
|
||||
}
|
||||
}
|
||||
|
@ -32,7 +32,7 @@ __CHECK_ENV_VAR() {
|
||||
[ $DEFAULT_VALUE ] && $NAME="$DEFAULT_VALUE"
|
||||
return 0
|
||||
} || {
|
||||
ERROR "'$NAME' required"
|
||||
ERROR "variable '$NAME' required"
|
||||
return 1
|
||||
}
|
||||
}
|
||||
|
@ -99,7 +99,7 @@ Yn() {
|
||||
PROMPT "$@ [Yn]"
|
||||
[ $CI ] && { echo y; return 0; }
|
||||
|
||||
local Yn; READ -k Yn; echo
|
||||
local Yn; READ -k Yn; echo >&2
|
||||
[[ $Yn =~ [nN] ]] && return 1 || return 0
|
||||
}
|
||||
|
||||
@ -107,7 +107,7 @@ yN() {
|
||||
PROMPT "$@ [yN]"
|
||||
[ $CI ] && { echo y; return 0; }
|
||||
|
||||
local yN; READ -k yN; echo
|
||||
local yN; READ -k yN; echo >&2
|
||||
[[ $yN =~ [yY] ]] && return 0 || return 1
|
||||
}
|
||||
|
||||
|
@ -18,6 +18,12 @@ source ${0:a:h}/environment.zsh
|
||||
#####################################################################
|
||||
|
||||
CHECK_ENVIRONMENT() {
|
||||
local OPTIONAL=0
|
||||
[[ $1 =~ --optional ]] && OPTIONAL=1
|
||||
|
||||
[[ $OPTIONAL -eq 1 ]] \
|
||||
&& E=WARNING || E=ERROR
|
||||
|
||||
local ENVIRONMENT_STATUS=0
|
||||
|
||||
__CHECK_DEPENDENCIES $DEPENDENCIES
|
||||
@ -55,9 +61,9 @@ CHECK_ENVIRONMENT() {
|
||||
|
||||
##########################################
|
||||
|
||||
[[ ENVIRONMENT_STATUS -eq 0 ]] || {
|
||||
[[ ENVIRONMENT_STATUS -ne 0 ]] && [[ $OPTIONAL -eq 0 ]] && {
|
||||
ERROR_MESSAGE=$(echo $ERROR_MESSAGE | sed '1d; s/^/ /')
|
||||
ERROR "environment errors found (see above)\n$ERROR_MESSAGE"
|
||||
$E "environment errors found (see above)\n$ERROR_MESSAGE"
|
||||
}
|
||||
|
||||
[[ $MISSING_ENVIRONMENT_VARIABLES -ne 0 ]] && {
|
||||
@ -67,10 +73,11 @@ CHECK_ENVIRONMENT() {
|
||||
"
|
||||
}
|
||||
|
||||
[[ $ENVIRONMENT_STATUS -eq 0 ]] || {
|
||||
[[ $NO_EXIT -eq 1 ]] && return $ENVIRONMENT_STATUS
|
||||
[[ $ENVIRONMENT_STATUS -ne 0 ]] && [[ $NO_EXIT -ne 1 ]] && [[ $OPTIONAL -eq 0 ]] && {
|
||||
exit $ENVIRONMENT_STATUS
|
||||
}
|
||||
|
||||
return $ENVIRONMENT_STATUS
|
||||
}
|
||||
|
||||
CHECK_ENVIRONMENT
|
||||
|
Reference in New Issue
Block a user