v3.8.0
===================================================================== --- Changes ------------------------------ - kubectl driver updates; getting better, but still need to fix autocomplete in certain circumstances - added -y|--yes flags to scwrypts to auto-accept user-prompts (use with caution) - figured out the whole mikefarah/yq vs kislyuk/yq thing; use YQ for compatiblity --- Bug fixes ---------------------------- - helm template generation now loads values in a more appropriate order which prevents overwrite by the wrong values file
This commit is contained in:
@ -17,6 +17,13 @@ __CHECK_DEPENDENCY() {
|
||||
$E "application '$1' "$([[ $OPTIONAL -eq 1 ]] && echo preferred || echo required)" but not available on PATH $(__CREDITS $1)"
|
||||
return 1
|
||||
}
|
||||
|
||||
[[ $DEPENDENCY =~ ^yq$ ]] && {
|
||||
yq --version | grep -q mikefarah \
|
||||
|| WARNING 'detected kislyuk/yq but mikefarah/yq is preferred (compatibility may vary)'
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
__CHECK_COREUTILS() {
|
||||
@ -36,7 +43,7 @@ __CHECK_COREUTILS() {
|
||||
done
|
||||
|
||||
[[ $NON_GNU_DEPENDENCY_COUNT -gt 0 ]] && {
|
||||
WARNING 'scripts rely on GNU coreutils; functionality may be limited'
|
||||
WARNING 'scripts rely on GNU coreutils; compatibility may vary'
|
||||
IS_MACOS && REMINDER 'GNU coreutils can be installed and linked through Homebrew'
|
||||
}
|
||||
|
||||
|
@ -142,6 +142,7 @@ INPUT() {
|
||||
Yn() {
|
||||
PROMPT "$@ [Yn]"
|
||||
[ $CI ] && { echo y; return 0; }
|
||||
[ $__SCWRYPTS_YES ] && [[ $__SCWRYPTS_YES -eq 1 ]] && { echo y; return 0; }
|
||||
|
||||
local Yn; READ -k Yn; echo >&2
|
||||
[[ $Yn =~ [nN] ]] && return 1 || return 0
|
||||
@ -150,6 +151,7 @@ Yn() {
|
||||
yN() {
|
||||
PROMPT "$@ [yN]"
|
||||
[ $CI ] && { echo y; return 0; }
|
||||
[ $__SCWRYPTS_YES ] && [[ $__SCWRYPTS_YES -eq 1 ]] && { echo y; return 0; }
|
||||
|
||||
local yN; READ -k yN; echo >&2
|
||||
[[ $yN =~ [yY] ]] && return 0 || return 1
|
||||
@ -218,3 +220,12 @@ EDIT() {
|
||||
$EDITOR $@ </dev/tty >/dev/tty
|
||||
SUCCESS "finished editing '$1'!"
|
||||
}
|
||||
|
||||
YQ() {
|
||||
yq --version | grep -q mikefarah || {
|
||||
yq $@
|
||||
return $?
|
||||
}
|
||||
|
||||
yq eval '... comments=""' | yq $@
|
||||
}
|
||||
|
Reference in New Issue
Block a user