diff options
| author | Dennis Eriksen <d@ennis.no> | 2024-09-09 11:34:46 +0200 |
|---|---|---|
| committer | Dennis Eriksen <d@ennis.no> | 2024-09-09 11:34:46 +0200 |
| commit | cfedce433a3a0a3eac24d3c5cf03d67c95e9f7e8 (patch) | |
| tree | 20abcb6c5ba453d1ca88d9dda64bf355251f1aaa | |
| parent | say: add flag -f to set printflags (diff) | |
| download | idgatt-cfedce433a3a0a3eac24d3c5cf03d67c95e9f7e8.tar.gz | |
fix: don't set _SAY_HELPTEXT again if already set, print errors with -r
| -rw-r--r-- | zsh/.zsh/functions/say | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/zsh/.zsh/functions/say b/zsh/.zsh/functions/say index 36c0383..982ab4f 100644 --- a/zsh/.zsh/functions/say +++ b/zsh/.zsh/functions/say @@ -82,7 +82,7 @@ zmodload -F zsh/termcap +p:termcap 2>/dev/null && \ typeset -gm '_SAY_COLORCODE_s*' '_SAY_COLORCODE_e*' # Helptext -typeset -gr _SAY_HELPSTRING='NAME +: ${_SAY_HELPSTRING='NAME say - a function you can use to log messages in a zsh-script. SYNOPSIS @@ -161,8 +161,8 @@ DESCTIPTION LOGLEVEL 0-4 prints to stderr, and 5-7 prints to stdout. AUTHOR - Dennis Eriksen <https://dnns.no>' - + Dennis Eriksen <https://dnns.no>'} +typeset -gr _SAY_HELPSTRING zmodload -F zsh/datetime +b:strftime 2>/dev/null || true # Just use `date` if we can't load datetime @@ -217,23 +217,23 @@ say() { e) _say_checkint $OPTARG 0 255 || return 103 exitcode=$OPTARG exitbool=1 ;; - f) [[ $OPTARG == *-* ]] && print -u2 -- "\`${0:t} -f\` takes flags for the print() function, but without the '-'." && return 107 + f) [[ $OPTARG == *-* ]] && print -ru2 -- "\`${0:t} -f\` takes flags for the print() function, but without the '-'." && return 107 pflags+=( $=OPTARG ) ;; - h) print -- $_SAY_HELPSTRING && return 0 ;; + h) print -r -- $_SAY_HELPSTRING && return 0 ;; i) _say_checkint $OPTARG 0 || return 106 inputfd=$OPTARG ;; n) _SAY_COLOR=0 _SAY_PRINT_DATE=0 _SAY_PRINT_SEV=0 ;; - r) [[ ! $OPTARG == <0-255> ]] && print -u2 -- "\`${0:t} -r\` takes exactly one argument - an int between 0 and 255. You provided: \'$OPTARG\'" && return 105 + r) [[ ! $OPTARG == <0-255> ]] && print -ru2 -- "\`${0:t} -r\` takes exactly one argument - an int between 0 and 255. You provided: \'$OPTARG\'" && return 105 returncode=$OPTARG returnbool=1 ;; S) _SAY_PRINT_SEV=0 ;; s) _SAY_PRINT_SEV=1 ;; - u) [[ ! $OPTARG == <0-> ]] && print -u2 -- "\`${0:t} -u\` takes one argument - a positive integer. \`${0:t} -u n\` will print to filedescriptor n." && return 104 + u) [[ ! $OPTARG == <0-> ]] && print -ru2 -- "\`${0:t} -u\` takes one argument - a positive integer. \`${0:t} -u n\` will print to filedescriptor n." && return 104 pflags+=( u$OPTARG ) ;; - :) print -u2 -- "${0:t}: option \'$OPTARG\' is missing an argument" - print -u2 -- "Try \'${0:t} -h\' for more info" && return 101 ;; - ?) print -u2 -- "${0:t}: invalid option -- \'$OPTARG\'" - print -u2 -- "Try \'${0:t} -h\' for more info" && return 102 ;; + :) print -ru2 -- "${0:t}: option \'$OPTARG\' is missing an argument" + print -ru2 -- "Try \'${0:t} -h\' for more info" && return 101 ;; + ?) print -ru2 -- "${0:t}: invalid option -- \'$OPTARG\'" + print -ru2 -- "Try \'${0:t} -h\' for more info" && return 102 ;; esac done; (( OPTIND > 1 )) && shift $(( OPTIND - 1 )) |