X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-install;h=22192710afd1ccb589f959475f5ba27e30d84130;hb=e8fbd976703ac893302c8264f8ad4f540b271829;hp=b0cb8aa37a9a1ba379c1db88554d4d4ca8d5e2d1;hpb=fa148616963d8d1f3eb8fe3b3997cb5db6bde6b5;p=zpackage

diff --git a/zpm-install b/zpm-install
index b0cb8aa..2219271 100755
--- a/zpm-install
+++ b/zpm-install
@@ -9,15 +9,20 @@ dryrun=0
 verbose=0
 runscripts=1
 runconfigure=1
+absorb=0
+overwrite=0
+syncopts=''
 
 # zpm-install [-SCn] [ -d localdb ] [ -f pkgfile ] [ -R installroot ] pkgstr ...
-while getopts f:d:R:nSCv opt; do
+while getopts f:d:R:nSCvAO opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
 		d) localdb="$OPTARG" ;;
 		R) rootdir="$OPTARG" ;;
 		S) runscripts=0 ;;
 		C) runconfigure=0 ;;
+		A) absorb=1; syncopts="${syncopts} -A" ;;
+		O) overwrite=1; syncopts="${syncopts} -O" ;;
 		n) dryrun=1 ;;
 		v) verbose=1 ;;
 		*) die "usage ..." ;;
@@ -79,13 +84,22 @@ package=$(zpm quote "$name")
 pkgver=$(zpm quote "$version")
 pkgrel=$(zpm quote "$release")
 
-if [ -z "$localdb" ]; then
+if [ -z "$rootdir" ]; then
 	: rootdir=${rootdir%%/}
-	localdb=${rootdir:-/}/var/lib/zpm/local.db
+fi
+
+if [ -z "$localdb" ]; then
+	localdb=${rootdir}/var/lib/zpm/local.db
 fi
 
 if [ ! -f "$localdb" ]; then
+	for d in /var /var/lib /var/lib/zpm; do
+		test -d $rootdir/$d || mkdir $rootdir/$d || die "can't create $rootdir/$d/: $!"
+	done
 	zpm init "$localdb"
+	if [ $? -ne 0 ]; then
+		die "aborting install"
+	fi
 fi
 
 ZPMDB=$localdb
@@ -163,17 +177,17 @@ for pkgstr in "$@"; do
 	if [ $dryrun -gt 0 ]; then
 		#zpm list -v
 		#zpm shell $ZPMDB 'select * from install_status'
-		zpm syncfs -nv -f $pkgfile
+		zpm syncfs $syncopts -nv -f $pkgfile
 		zpm pkg $pkgid status=dryrun
 		continue
 	fi
 
 	if [ $verbose -gt 0 ]; then
-		zpm syncfs -v -f $pkgfile
-	else
-		zpm syncfs -f $pkgfile
+		syncopts="${syncopts} -v"
 	fi
 
+	zpm syncfs $syncopts -f $pkgfile
+
 	if [ $? -ne 0 ]; then
 		die 'zpm-syncfs failed';
 	fi
@@ -189,7 +203,13 @@ for pkgstr in "$@"; do
 	fi
 
 	if [ $(id -u) -eq 0 ]; then
-		/sbin/ldconfig
+		if [ -f $rootdir/sbin/ldconfig ]; then
+			$rootdir/sbin/ldconfig -r ${rootdir:-/}
+		elif [ -f /sbin/ldconfig ]; then
+			/sbin/ldconfig -r ${rootdir:-/}
+		else
+			true
+		fi
 	fi
 
 	# TODO skip configure if not on a terminal, regardless of settings