From 6415605174077b2ebb58590800bc863e46fd4de7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 7 May 2020 14:46:50 +0300 Subject: [PATCH] kiss: Fix error messages --- kiss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kiss b/kiss index 510b770..05d74bd 100755 --- a/kiss +++ b/kiss @@ -75,11 +75,11 @@ log() { } war() { - log "$1" "$2" WARNING + log "$1" "$2" "${3:-WARNING}" } die() { - log "$1" "$2" ERROR + log "$1" "$2" "${3:-ERROR}" exit 1 } @@ -878,7 +878,7 @@ pkg_conflicts() { log "/sbin instead of /usr/bin (example)" log "Before this package can be used as an alternative," log "this must be fixed in $p_name. Contact the maintainer" - die "by checking 'git log' or by running 'kiss-maintainer'" + die "by finding their details via 'kiss-maintainer'" "" "!>" } done < "$cac_dir/$pid-c" @@ -889,7 +889,7 @@ pkg_conflicts() { elif [ -s "$cac_dir/$pid-c" ]; then log "Package '$p_name' conflicts with another package" "" "!>" log "Run 'KISS_CHOICE=1 kiss i $p_name' to add conflicts" "" "!>" - die "as alternatives." + die "as alternatives." "" "!>" fi }