X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-merge;fp=zpm-merge;h=b9cc83ef16ba81f832c559ac68201fd7ab9b3762;hb=64c5c5250d06e5ac98c5e6e7773ede8198fce273;hp=fc8a38bab11477c16d9e0479497ee3925d4cc19f;hpb=978ecbabb286ab512d96fb327d25935b9124e8a3;p=zpackage 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