diff --git a/bin/lib/format.nix b/bin/lib/format.nix index eadd123722d1b940448560d8449063ec519a0745..788277b7584577dbb668c23099192fa46857f905 100644 --- a/bin/lib/format.nix +++ b/bin/lib/format.nix @@ -47,23 +47,6 @@ assert (typeOf swap) == "string"; print "Usage: $cmdname <CONFIG_FILE> <OUTPUT_FILE>" >&2 } - print_info() { - if [[ $# -ge 1 ]] - then - print -P "%B%F{blue}$1%b%f" >&2 - else - print >&2 - fi - } - - print_warning() { - print -P "%B%F{yellow}$1%b%f" >&2 - } - - print_error() { - print -P "%B%F{red}$1%b%f" >&2 - } - if [ "$1" = "--help" -o "$1" = "-h" ] then usage diff --git a/bin/lib/util.zsh b/bin/lib/util.zsh index ef03cdf45563d05c602ec7b9843b9963ef24f9b9..120d950eeae5ef95c10a897908b43e84f47b014f 100644 --- a/bin/lib/util.zsh +++ b/bin/lib/util.zsh @@ -1,11 +1,26 @@ print_info() { - print -P "%B%F{blue}$1%b%f" >&2 + if [[ $# -ge 1 ]] + then + print -P "%B%F{blue}$1%b%f" >&2 + else + print >&2 + fi } print_warning() { - print -P "%B%F{yellow}$1%b%f" >&2 + if [[ $# -ge 1 ]] + then + print -P "%B%F{yellow}$1%b%f" >&2 + else + print >&2 + fi } print_error() { - print -P "%B%F{red}$1%b%f" >&2 + if [[ $# -ge 1 ]] + then + print -P "%B%F{red}$1%b%f" >&2 + else + print >&2 + fi }