From 847e7dce9dce958eb058291b8a2b5aaa7cffb39b Mon Sep 17 00:00:00 2001
From: Nathan Wagner <nw@hydaspes.if.org>
Date: Tue, 21 Aug 2018 11:19:44 +0000
Subject: [PATCH] get install upgrades working

---
 zpm-install | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/zpm-install b/zpm-install
index 173ff1b..40e5a43 100755
--- a/zpm-install
+++ b/zpm-install
@@ -154,9 +154,10 @@ pkgname() {
 # paths to replace
 
 newfiles() {
-	#zpm merge $pkgfile $newver
-
-	# add...
+	nv=$1
+	ov=$2
+#	printf "zzz checking %s vs %s\n" "$1" "$2"
+#	printf "zzz checking %s vs %s\n" "$nv" "$ov"
 	zpm shell $ZPMDB<<-EOS
 	select NV.path
 	from packagefiles NV
@@ -172,8 +173,6 @@ newfiles() {
 }
 
 removedfiles() {
-	#zpm merge $pkgfile $newver
-
 	zpm shell $ZPMDB<<-EOS
 	select OV.path
 	from packagefiles OV
@@ -213,20 +212,22 @@ do_upgrade() {
 	zpm merge $pkgfile $newver
 	zpm pkg $newver status installing
 
-	echo newfiles
-	newct=$(newfiles | wc -l)
+	newct=$(newfiles "$newver" "$oldver" | wc -l)
+	echo newfiles $newct
+
 	if [ $newct -gt 0 ]; then
-		newfiles $newver $oldver | xargs zpm ipkgfile ${user+-u $user} ${group+-g $group} -R "$pkgroot" -f $pkgfile -- $nver
+	newfiles $newver $oldver
+	{ newfiles "$newver" "$oldver"; } | xargs zpm ipkgfile ${user+-u $user} ${group+-g $group} -R "$pkgroot" -f $pkgfile -- $nver
 	fi
 
-	echo changed
-	ct=$(changedfiles | wc -l)
+	ct=$(changedfiles $newver $oldver | wc -l)
+	echo changed $ct
 	if [ $ct -gt 0 ]; then
 		changedfiles $newver $oldver | xargs zpm ipkgfile ${user+-u $user} ${group+-g $group} -R "$pkgroot" -f $pkgfile -- $pkg
 	fi
 
-	echo removed
-	ct=$(removedfiles | wc -l)
+	ct=$(removedfiles $newver $oldver | wc -l)
+	echo removed $ct
 	if [ $ct -gt 0 ]; then
 		removedfiles $newver $oldver | xargs rm
 	fi
-- 
2.40.0