yage
76a746a53e
===================================================================== Notice the major version change which comes with breaking changes to 2.x! Reconstructs "library" functions for both python and zsh scwrypts, with changes to virtualenv naming conventions (you'll need to refresh all virtualenv with the appropriate scwrypt). --- Changes ------------------------------ - changed a naming convention across zsh scripts, particularly removing underscores where there is no need to avoid naming clash (e.g. 'zsh/lib/utils/io.zsh' renames '__STATUS' to 'STATUS') - moved clients reliant on py.lib.http to the py.lib.http module - python scripts now rely on py.lib.scwrypts.execute - updated package.json in zx scripts to include `type = module` - 'scwrypts --list' commandline argument now includes additional relevant data for each scwrypt - environment variables no longer add themselves to be staged in the '.env.template' --- New Features ------------------------- - new 'use' syntax for disjoint import within zsh scripts; took me a very long time to convince myself this would be necessary - introduced scwrypt "groups" to allow portable module creation; (i.e. ability add your own scripts from another repo!) - py.lib.scwrypts.io provides a combined IO stream for quick, hybrid use of input/output files and stdin/stdout - py.lib.fzf provides a wrapper to provide similar functionality to zsh/utils/io.zsh including fzf_(head|tail) - improved efficiency of various scwrypts; notably reducing runtime of scwrypts/environment sync - improved scwrypts CLI by adding new options for exact scwrypt matching, better filtering, and prettier/more-detailed interfaces --- New Scripts -------------------------- - py/twilio ) basic SMS integration with twilio - send-sms - py/directus ) interactive directus GET query - get-items - py/discord ) post message to discord channel or webhook - post-message
153 lines
3.4 KiB
Bash
153 lines
3.4 KiB
Bash
PRINT() {
|
|
local MESSAGE
|
|
local LAST_LINE_END='\n'
|
|
local STDERR=1
|
|
local STDOUT=0
|
|
|
|
local LTRIM=1
|
|
while [[ $# -gt 0 ]]
|
|
do
|
|
case $1 in
|
|
-n | --no-trim-tabs ) LTRIM=0 ;;
|
|
-x | --no-line-end ) LAST_LINE_END='' ;;
|
|
-o | --use-stdout ) STDOUT=1; STDERR=0 ;;
|
|
* ) MESSAGE+="$(echo $1) " ;;
|
|
esac
|
|
shift 1
|
|
done
|
|
|
|
local STYLED_MESSAGE="${COLOR}$({
|
|
printf "${COLOR}"
|
|
while IFS='' read line
|
|
do
|
|
[[ $PREFIX =~ ^[[:space:]]\+$ ]] && printf '\n'
|
|
|
|
printf "${PREFIX} : $(echo "$line" | sed 's/^ \+//; s/ \+$//')"
|
|
|
|
PREFIX=$(echo $PREFIX | sed 's/./ /g')
|
|
done <<< $MESSAGE
|
|
})${__COLOR_RESET}${LAST_LINE_END}"
|
|
[[ $STDERR -eq 1 ]] && printf $STYLED_MESSAGE >&2
|
|
[[ $STDOUT -eq 1 ]] && printf $STYLED_MESSAGE
|
|
|
|
return 0
|
|
}
|
|
|
|
[ ! $ERRORS ] && ERRORS=0
|
|
ERROR() { PREFIX="ERROR ✖" COLOR=$__RED PRINT "$@"; ((ERRORS+=1)); }
|
|
SUCCESS() { PREFIX="SUCCESS ✔" COLOR=$__GREEN PRINT "$@"; }
|
|
WARNING() { PREFIX="WARNING " COLOR=$__ORANGE PRINT "$@"; }
|
|
STATUS() { PREFIX="STATUS " COLOR=$__BLUE PRINT "$@"; }
|
|
REMINDER() { PREFIX="REMINDER " COLOR=$__PURPLE PRINT "$@"; }
|
|
INFO() { PREFIX="INFO " COLOR=$__WHITE PRINT "$@"; }
|
|
|
|
PROMPT() {
|
|
PREFIX="PROMPT " COLOR=$__CYAN PRINT "$@"
|
|
PREFIX="USER " COLOR=$__CYAN PRINT '' --no-line-end
|
|
}
|
|
|
|
FAIL() { ERROR "${@:2}"; exit $1; }
|
|
ABORT() { FAIL 69 'user abort'; }
|
|
|
|
CHECK_ERRORS() {
|
|
local FAIL_OUT=1
|
|
|
|
while [[ $# -gt 0 ]]
|
|
do
|
|
case $1 in
|
|
-n | --no-fail ) FAIL_OUT=0 ;;
|
|
esac
|
|
shift 1
|
|
done
|
|
|
|
[ ! $ERRORS ] && ERRORS=0
|
|
[[ $ERRORS -ne 0 ]] && USAGE
|
|
[[ $ERRORS -eq 0 ]] || {
|
|
[[ $FAIL_OUT -eq 1 ]] \
|
|
&& exit $ERRORS \
|
|
|| return $ERRORS
|
|
}
|
|
}
|
|
|
|
USAGE() {
|
|
[ ! $USAGE ] && return 0
|
|
USAGE=$(echo $USAGE | sed "s/^\t\+//; s/\s\+$//")
|
|
|
|
local USAGE_LINE=$(\
|
|
echo $USAGE \
|
|
| grep -i '^ *usage *:' \
|
|
| sed "s;^[^:]*:;& scwrypts $SCWRYPT_NAME --;" \
|
|
| sed 's/ \{2,\}/ /g; s/scwrypts -- scwrypts/scwrypts/' \
|
|
)
|
|
local THE_REST=$(echo $USAGE | grep -vi '^ *usage *:' | sed 'N;/^\n$/D;P;D;')
|
|
|
|
{ echo; printf "$__DARK_BLUE $USAGE_LINE$__COLOR_RESET\n"; echo $THE_REST; echo } >&2
|
|
}
|
|
|
|
INPUT() {
|
|
PROMPT "${@:2}"
|
|
READ $1
|
|
local VALUE=$(eval echo '$'$1)
|
|
[ $VALUE ]
|
|
}
|
|
|
|
Yn() {
|
|
PROMPT "$@ [Yn]"
|
|
[ $CI ] && { echo y; return 0; }
|
|
|
|
local Yn; READ -k Yn; echo
|
|
[[ $Yn =~ [nN] ]] && return 1 || return 0
|
|
}
|
|
|
|
yN() {
|
|
PROMPT "$@ [yN]"
|
|
[ $CI ] && { echo y; return 0; }
|
|
|
|
local yN; READ -k yN; echo
|
|
[[ $yN =~ [yY] ]] && return 0 || return 1
|
|
}
|
|
|
|
#####################################################################
|
|
|
|
GETSUDO() {
|
|
echo "\\033[1;36mPROMPT : checking sudo password...\\033[0m" >&2
|
|
sudo echo hi >/dev/null 2>&1 </dev/tty \
|
|
&& SUCCESS '...authenticated!' \
|
|
|| { ERROR 'failed :c'; return 1; }
|
|
}
|
|
|
|
LESS() { less -R $@ </dev/tty >/dev/tty; }
|
|
|
|
FZF() {
|
|
[ $CI ] && {
|
|
ERROR 'currently in CI, but FZF requires user input'
|
|
exit 1
|
|
}
|
|
|
|
local SELECTION=$(fzf -i --height=30% --layout=reverse --prompt "$1 : " ${@:2})
|
|
PROMPT "$1"
|
|
echo $SELECTION >&2
|
|
echo $SELECTION
|
|
}
|
|
FZF_HEAD() { FZF $@ --print-query | sed '/^$/d' | head -n1; } # prefer user input over selected
|
|
FZF_TAIL() { FZF $@ --print-query | sed '/^$/d' | tail -n1; } # prefer selected over user input
|
|
|
|
READ() {
|
|
[ $CI ] && {
|
|
INFO 'currently in CI, skipping READ'
|
|
return 0
|
|
}
|
|
read $@ </dev/tty
|
|
}
|
|
|
|
EDIT() {
|
|
[ $CI ] && {
|
|
INFO 'currently in CI, skipping EDIT'
|
|
return 0
|
|
}
|
|
|
|
STATUS "opening '$1' for editing"
|
|
$EDITOR $@ </dev/tty >/dev/tty
|
|
SUCCESS "finished editing '$1'!"
|
|
}
|