From 64c5c5250d06e5ac98c5e6e7773ede8198fce273 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Fri, 30 Nov 2018 12:48:35 +0000 Subject: [PATCH] better verbose chatter in zpm-merge --- zpm-merge | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/zpm-merge b/zpm-merge index fc8a38b..b9cc83e 100755 --- 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 -- 2.40.0