X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-update;h=5786aa5c0bf70901d2927b7becbff67dccf0cdce;hb=ce38dde467cb64991032812eaaac31deb3c39da5;hp=39c111a2f17f6e7274bac7f298f09834b8e427ea;hpb=a694aec82a1062a9f6dce92ee62dcce229658f7a;p=zpackage diff --git a/zpm-update b/zpm-update index 39c111a..5786aa5 100755 --- a/zpm-update +++ b/zpm-update @@ -109,7 +109,7 @@ uninstall=0 # TODO option to attempt to resume an ongoing install # zpm-install [-SCn] [ -d localdb ] [ -f pkgfile ] [ -R installroot ] pkgstr ... -while getopts f:d:R:nSCvAObBLUzp opt; do +while getopts f:d:R:nSCvAObBLUzpl opt; do case $opt in f) pkgfile="$OPTARG" ;; d) localdb="$OPTARG" ;; @@ -237,7 +237,6 @@ for mergepkg in $merge; do nlist="$nlist $pkgid:$zpmfile" continue else - echo downloading $zpmfile zpm repo fetch $reponame $pkgid if [ -f "$zpmfile" ]; then nlist="$nlist $pkgid:$zpmfile" @@ -293,7 +292,7 @@ for mergepkg in $merge; do # TODO check for symlinks? if [ $pkgfile != $ZPMDB ]; then echo merging $pkgfile $pkgid - zpm merge -Fuv -f "$pkgfile" $pkgid + zpm merge -Fu -f "$pkgfile" $pkgid if [ $? -ne 0 ]; then die "unable to merge $pkgfile" fi