]> pd.if.org Git - zpackage/commitdiff
fix merge
authorNathan Wagner <nw@hydaspes.if.org>
Fri, 30 Nov 2018 13:11:01 +0000 (13:11 +0000)
committerNathan Wagner <nw@hydaspes.if.org>
Fri, 30 Nov 2018 13:11:01 +0000 (13:11 +0000)
zpm-merge

index b9cc83ef16ba81f832c559ac68201fd7ab9b3762..840296f35883356bd9fccc8949fc5ffbafa5a866 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -216,6 +216,7 @@ merge_list() {
 
        printf "commit;\n"
 ) | zpm shell $target
+}
 
 # check for already merged packages
 if [ $update -eq 0 ] && [ $only_if_newer -eq 0 ]; then
@@ -236,8 +237,6 @@ 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