From 6b5150de70d70d49360fb3804af8136f442dffc1 Mon Sep 17 00:00:00 2001
From: Nathan Wagner <nw@hydaspes.if.org>
Date: Mon, 8 Oct 2018 17:41:16 +0000
Subject: [PATCH] add pass through absorb and overwrite options

---
 zpm-install | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/zpm-install b/zpm-install
index a9a748d..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,12 +84,18 @@ 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"
@@ -166,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
-- 
2.40.0