- removed deprecated --no-log
- added experimental support for --output json - added list-groups and --config to imporve utility outside of scwrypts runtime
This commit is contained in:
@ -5,34 +5,61 @@ PRINT() {
|
||||
local STDOUT=0
|
||||
|
||||
local LTRIM=1
|
||||
local FORMAT=$SCWRYPTS_OUTPUT_FORMAT
|
||||
local _S
|
||||
while [[ $# -gt 0 ]]
|
||||
do
|
||||
_S=1
|
||||
case $1 in
|
||||
-n | --no-trim-tabs ) LTRIM=0 ;;
|
||||
-x | --no-line-end ) LAST_LINE_END='' ;;
|
||||
-o | --use-stdout ) STDOUT=1; STDERR=0 ;;
|
||||
|
||||
-f | --format ) ((_S+=1)); FORMAT=$2 ;;
|
||||
|
||||
* ) MESSAGE+="$(echo $1) " ;;
|
||||
esac
|
||||
shift 1
|
||||
shift $_S
|
||||
done
|
||||
|
||||
MESSAGE="$(echo "$MESSAGE" | sed 's/%/%%/g')"
|
||||
[ $FORMAT ] || FORMAT=pretty
|
||||
local STYLED_MESSAGE
|
||||
case $FORMAT in
|
||||
pretty )
|
||||
STYLED_MESSAGE="$(echo "$MESSAGE" | sed 's/%/%%/g')"
|
||||
STYLED_MESSAGE="$({
|
||||
printf "${COLOR}"
|
||||
while IFS='' read line
|
||||
do
|
||||
[[ $PREFIX =~ ^[[:space:]]\+$ ]] && printf '\n'
|
||||
|
||||
local STYLED_MESSAGE="$({
|
||||
printf "${COLOR}"
|
||||
while IFS='' read line
|
||||
do
|
||||
[[ $PREFIX =~ ^[[:space:]]\+$ ]] && printf '\n'
|
||||
printf "${PREFIX} : $(echo "$line" | sed 's/^ \+//; s/ \+$//')"
|
||||
|
||||
printf "${PREFIX} : $(echo "$line" | sed 's/^ \+//; s/ \+$//')"
|
||||
PREFIX=$(echo $PREFIX | sed 's/./ /g')
|
||||
done <<< $MESSAGE
|
||||
})"
|
||||
STYLED_MESSAGE="${COLOR}$(echo "$STYLED_MESSAGE" | sed 's/%/%%/g')${__COLOR_RESET}${LAST_LINE_END}"
|
||||
;;
|
||||
json )
|
||||
STYLED_MESSAGE="$(
|
||||
echo '{}' | jq -c ".
|
||||
| .timestamp = \"$(date +%s)\"
|
||||
| .runtime = \"$SCWRYPTS_RUNTIME_ID\"
|
||||
| .status = \"$(echo "$PREFIX" | sed 's/ .*//')\"
|
||||
| .message = $(echo $MESSAGE | sed 's/^\t\+//' | jq -Rs)
|
||||
" | sed 's/\\/\\\\/g'
|
||||
)\n"
|
||||
;;
|
||||
* )
|
||||
echo "ERROR : unsupported format '$FORMAT'" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
||||
PREFIX=$(echo $PREFIX | sed 's/./ /g')
|
||||
done <<< $MESSAGE
|
||||
})"
|
||||
STYLED_MESSAGE="${COLOR}$(echo "$STYLED_MESSAGE" | sed 's/%/%%/g')${__COLOR_RESET}${LAST_LINE_END}"
|
||||
|
||||
[[ $STDERR -eq 1 ]] && printf $STYLED_MESSAGE >&2
|
||||
[[ $STDOUT -eq 1 ]] && printf $STYLED_MESSAGE
|
||||
|
||||
[[ $STDERR -eq 1 ]] && printf -- "$STYLED_MESSAGE" >&2
|
||||
[[ $STDOUT -eq 1 ]] && printf -- "$STYLED_MESSAGE"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
@ -72,7 +72,7 @@ CHECK_ENVIRONMENT() {
|
||||
$E "environment errors found (see above)\n$ERROR_MESSAGE"
|
||||
}
|
||||
|
||||
[[ $MISSING_ENVIRONMENT_VARIABLES -ne 0 ]] && {
|
||||
[[ $MISSING_ENVIRONMENT_VARIABLES -ne 0 ]] && [[ $__SCWRYPT ]] && {
|
||||
REMINDER "
|
||||
to quickly update missing environment variables, run:
|
||||
'scwrypts zsh/scwrypts/environment/edit'
|
||||
|
Reference in New Issue
Block a user