X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-update;h=39c111a2f17f6e7274bac7f298f09834b8e427ea;hp=dbec8b0ecf13f6fd94c219b4b03f68f5e9e5ee7c;hb=62f6ff407bc4f2cf03d1fa7cf3dc9a3f4026624a;hpb=562d7c77072b14a4db68926ce6c8ac3753a1bad0

diff --git a/zpm-update b/zpm-update
index dbec8b0..39c111a 100755
--- a/zpm-update
+++ b/zpm-update
@@ -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
 
@@ -323,12 +335,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"