Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
4c161aba49 | |||
3ea2e0cd8f | |||
e0cbf58b3c | |||
09c214f939 |
19
run
19
run
@ -208,6 +208,12 @@ __RUN() {
|
|||||||
##########################################
|
##########################################
|
||||||
|
|
||||||
local ENV_REQUIRED=$(__CHECK_ENV_REQUIRED && echo 1 || echo 0)
|
local ENV_REQUIRED=$(__CHECK_ENV_REQUIRED && echo 1 || echo 0)
|
||||||
|
local REQUIRED_ENVIRONMENT_REGEX=$(eval echo '$SCWRYPTS_REQUIRED_ENVIRONMENT_REGEX__'$SCWRYPT_GROUP)
|
||||||
|
|
||||||
|
[ $REQUIRED_ENVIRONMENT_REGEX ] && {
|
||||||
|
[[ $ENV_NAME =~ $REQUIRED_ENVIRONMENT_REGEX ]] \
|
||||||
|
|| FAIL 5 "group '$SCWRYPT_GROUP' requires current environment to match '$REQUIRED_ENVIRONMENT_REGEX' (currently $ENV_NAME)"
|
||||||
|
}
|
||||||
|
|
||||||
[[ $ENV_REQUIRED -eq 1 ]] && {
|
[[ $ENV_REQUIRED -eq 1 ]] && {
|
||||||
[ ! $ENV_NAME ] && ENV_NAME=$(SCWRYPTS__SELECT_ENV)
|
[ ! $ENV_NAME ] && ENV_NAME=$(SCWRYPTS__SELECT_ENV)
|
||||||
@ -215,15 +221,20 @@ __RUN() {
|
|||||||
do
|
do
|
||||||
local ENV_FILE=$(SCWRYPTS__GET_ENV_FILE "$ENV_NAME" "$GROUP")
|
local ENV_FILE=$(SCWRYPTS__GET_ENV_FILE "$ENV_NAME" "$GROUP")
|
||||||
source "$ENV_FILE" || FAIL 5 "missing or invalid environment '$GROUP/$ENV_NAME'"
|
source "$ENV_FILE" || FAIL 5 "missing or invalid environment '$GROUP/$ENV_NAME'"
|
||||||
|
|
||||||
|
for f in $(eval 'echo $SCWRYPTS_STATIC_CONFIG__'$GROUP)
|
||||||
|
do
|
||||||
|
source "$f" || FAIL 5 "invalid static config '$f'"
|
||||||
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
export ENV_NAME
|
export ENV_NAME
|
||||||
}
|
}
|
||||||
|
|
||||||
for f in $(eval 'echo $SCWRYPTS_STATIC_CONFIG__'$SCWRYPT_GROUP)
|
[ $REQUIRED_ENVIRONMENT_REGEX ] && {
|
||||||
do
|
[[ $ENV_NAME =~ $REQUIRED_ENVIRONMENT_REGEX ]] \
|
||||||
source "$f" || FAIL 5 "invalid static config '$f'"
|
|| FAIL 5 "group '$SCWRYPT_GROUP' requires current environment to match '$REQUIRED_ENVIRONMENT_REGEX' (currently $ENV_NAME)"
|
||||||
done
|
}
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
|
|
||||||
|
@ -43,6 +43,10 @@ SCWRYPTS__GET_ENV_FILE() {
|
|||||||
SCWRYPTS__GET_ENV_NAMES | grep -q $NAME \
|
SCWRYPTS__GET_ENV_NAMES | grep -q $NAME \
|
||||||
|| { ERROR "no environment '$NAME' exists"; return 1; }
|
|| { ERROR "no environment '$NAME' exists"; return 1; }
|
||||||
|
|
||||||
|
[ -f "$SCWRYPTS_ENV_PATH/$GROUP/$NAME" ] || {
|
||||||
|
mkdir -p "$SCWRYPTS_ENV_PATH/$GROUP"
|
||||||
|
touch "$SCWRYPTS_ENV_PATH/$GROUP/$NAME"
|
||||||
|
}
|
||||||
[ -f "$SCWRYPTS_ENV_PATH/$GROUP/$NAME" ] \
|
[ -f "$SCWRYPTS_ENV_PATH/$GROUP/$NAME" ] \
|
||||||
|| { ERROR "missing environment file for '$GROUP/$NAME'"; return 2; }
|
|| { ERROR "missing environment file for '$GROUP/$NAME'"; return 2; }
|
||||||
}
|
}
|
||||||
@ -60,7 +64,11 @@ SCWRYPTS__GET_ENV_NAMES() {
|
|||||||
ERROR 'environment initialization error'
|
ERROR 'environment initialization error'
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
[ $REQUIRED_ENVIRONMENT_REGEX ] && {
|
||||||
|
ls "$SCWRYPTS_ENV_PATH/scwrypts" | grep "$REQUIRED_ENVIRONMENT_REGEX" | sort -r
|
||||||
|
} || {
|
||||||
ls "$SCWRYPTS_ENV_PATH/scwrypts" | sort -r
|
ls "$SCWRYPTS_ENV_PATH/scwrypts" | sort -r
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SCWRYPTS__INIT_ENVIRONMENTS() {
|
SCWRYPTS__INIT_ENVIRONMENTS() {
|
||||||
|
@ -128,7 +128,15 @@ FZF() {
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
local SELECTION=$(fzf -i --height=30% --layout=reverse --prompt "$1 : " ${@:2})
|
local FZF_ARGS=()
|
||||||
|
|
||||||
|
FZF_ARGS+=(-i)
|
||||||
|
FZF_ARGS+=(--ansi)
|
||||||
|
FZF_ARGS+=(--bind=ctrl-c:cancel)
|
||||||
|
FZF_ARGS+=(--height=50%)
|
||||||
|
FZF_ARGS+=(--layout=reverse)
|
||||||
|
|
||||||
|
local SELECTION=$(fzf ${FZF_ARGS[@]} --layout=reverse --prompt "$1 : " ${@:2})
|
||||||
PROMPT "$1"
|
PROMPT "$1"
|
||||||
echo $SELECTION >&2
|
echo $SELECTION >&2
|
||||||
echo $SELECTION
|
echo $SELECTION
|
||||||
|
Reference in New Issue
Block a user