From 7460f7a9c2911e6fd699df4bfd5cba0b9f65a04a Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Fri, 13 Dec 2019 02:44:08 +0100
Subject: [PATCH] Shell output functions can now handle being called with empty
arguments
---
bin/lib/format.nix | 17 -----------------
bin/lib/util.zsh | 21 ++++++++++++++++++---
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/bin/lib/format.nix b/bin/lib/format.nix
index eadd123..788277b 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 ef03cdf..120d950 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
}
--
GitLab