X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-update;h=0bac954fe6b84dad3cf8530edd88de02b9231de3;hb=92da0e851083ec948b2c86f368c6ddeae2dec5f6;hp=dbec8b0ecf13f6fd94c219b4b03f68f5e9e5ee7c;hpb=562d7c77072b14a4db68926ce6c8ac3753a1bad0;p=zpackage

diff --git a/zpm-update b/zpm-update
index dbec8b0..0bac954 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" ;;
@@ -132,10 +132,22 @@ while getopts f:d:R:nSCvAObBLUzp opt; do
 		*) die "usage ..." ;;
 	esac
 done
-shift $(( OPTIND - 1))
+shift $(( OPTIND - 1 ))
+
+if [ -n "$rootdir" ]; then
+	: rootdir=${rootdir%%/}
+	ZPM_ROOT_DIR=$rootdir
+	export ZPM_ROOT_DIR
+fi
+
+if [ -n "$localdb" ]; then
+	ZPMDB=$localdb
+elif [ -z "$ZPMDB" ]; then
+	ZPMDB="$ZPM_ROOT_DIR/var/lib/zpm/local.db"
+fi
 
-ZPMDB=${localdb:-${ZPMDB:-/var/lib/zpm/local.db}}
 export ZPMDB
+
 # create the localdb if needed
 zpm init $ZPMDB
 
@@ -225,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"
@@ -323,12 +334,6 @@ if [ -n "$to_remove" ]; then
 	done
 fi
 
-if [ -n "$rootdir" ]; then
-	ZPM_ROOT_DIR=$rootdir
-	export ZPM_ROOT_DIR
-	: rootdir=${rootdir%%/}
-fi
-
 if [ $dryrun -gt 0 ]; then
 	runscripts=0 # we don't want to run post scripts on a dry-run
 	syncopts="$syncopts -n"