]> pd.if.org Git - zpackage/commitdiff
better verbose chatter in zpm-merge
authorNathan Wagner <nw@hydaspes.if.org>
Fri, 30 Nov 2018 12:48:35 +0000 (12:48 +0000)
committerNathan Wagner <nw@hydaspes.if.org>
Fri, 30 Nov 2018 12:48:35 +0000 (12:48 +0000)
zpm-merge

index fc8a38bab11477c16d9e0479497ee3925d4cc19f..b9cc83ef16ba81f832c559ac68201fd7ab9b3762 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -217,11 +217,6 @@ merge_list() {
        printf "commit;\n"
 ) | zpm shell $target
 
-if [ $verbose -ne 0 ]; then
-       printf "%s\n" $pkglist
-fi
-}
-
 # check for already merged packages
 if [ $update -eq 0 ] && [ $only_if_newer -eq 0 ]; then
        have=$(filter_have $pkglist)
@@ -241,10 +236,18 @@ if [ $only_if_newer -eq 1 ]; then
        fi
 fi
 
+}
+
 if [ $one_at_a_time -eq 1 ]; then
        for pkgid in $pkglist; do
+               if [ $verbose -ne 0 ]; then
+                       printf '%s\n' $pkgid
+               fi
                merge_list $pkgid
        done
 else
+       if [ $verbose -ne 0 ]; then
+               printf "%s\n" $pkglist
+       fi
        merge_list $pkglist
 fi