X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-update;h=fcfb81668887476ce4aa872a051cb262dd312d92;hb=2eb30b5a4eb5feb15cab31a908686ef4e8d4b1f2;hp=fdfa1f6e3987cb4fa62c15a65da8f6736c753fe0;hpb=3178018143a7ffcef6746e802f58fe1c4725c0dd;p=zpackage diff --git a/zpm-update b/zpm-update index fdfa1f6..fcfb816 100755 --- a/zpm-update +++ b/zpm-update @@ -102,13 +102,14 @@ install_for_libs='' backup=0 ignorelibdeps=0 justlist=0 +pullrepos=1 # treat un-adorned packages as uninstalls 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:nSCvAObBLU opt; do +while getopts f:d:R:nSCvAObBLUz opt; do case $opt in f) pkgfile="$OPTARG" ;; d) localdb="$OPTARG" ;; @@ -126,6 +127,7 @@ while getopts f:d:R:nSCvAObBLU opt; do L) ignorelibdeps=1 ;; l) justlist=1 ;; U) uninstall=1 ;; + z) pullrepos=0 ;; *) die "usage ..." ;; esac done @@ -180,6 +182,11 @@ search=$(echo $search) ebail=0 +if [ $pullrepos -eq 1 ]; then + echo pulling repos + zpm repo pull +fi + if [ $ignorelibdeps -eq 1 ]; then merge=$(zpm search -iIO $search) else @@ -238,6 +245,12 @@ if [ -n "$baddl" ]; then die fi +for package in $merge; do + pkgid=${package%:*} + installlist="$installlist $pkgid" +done +installlist=${installlist#' '} + if [ $justlist -eq 1 ]; then for package in $merge; do pkgid=${package%:*} @@ -254,7 +267,7 @@ if [ -z "$merge" ] && [ -z "$to_remove" ]; then exit 0 fi -test -n "$merge" && echo "install: $merge" +test -n "$merge" && echo "install: $installlist" test -n "$to_remove" && echo "remove: $to_remove" # finally, merge everything