From db5b9b705b37e49304260cdf78a4422971efed24 Mon Sep 17 00:00:00 2001
From: Nathan Wagner <nw@hydaspes.if.org>
Date: Tue, 10 Apr 2018 02:05:04 -0500
Subject: [PATCH] more chatter in zpm-install

---
 zpm-install  |  6 +++++-
 zpm-ipkgfile | 13 +++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/zpm-install b/zpm-install
index be851ac..26095d2 100755
--- a/zpm-install
+++ b/zpm-install
@@ -93,7 +93,11 @@ for pkg in $pkglist; do
 	# zpm setmark installing $pkg
 	# install all the files for a package
 	# TODO install directories first in order of path length
-	pathlist | xargs zpm ipkgfile -R "$pkgroot" -f $pkgfile -- $pkg 
+	echo installing $pkglist
+	filecount=$(pathlist | wc -l)
+	echo $filecount files
+	pathlist
+	pathlist | xargs -t zpm ipkgfile -R "$pkgroot" -f $pkgfile -- $pkg
 
 	# TODO find scripts marked as post-install
 	# TODO if this is an upgrade, run post-upgrade
diff --git a/zpm-ipkgfile b/zpm-ipkgfile
index 088f807..a7be95a 100755
--- a/zpm-ipkgfile
+++ b/zpm-ipkgfile
@@ -42,21 +42,26 @@ fi
 pkg="$1"
 shift
 
+ZPMPKGFILE=$pkgfile
+export ZPMPKGFILE
+
 set -e
 for path in $*; do
+	echo installing $path from $pkg
+	set -x
 	fhash=$(zpm pkgfileinfo hash $path)
 	mode=$(zpm pkgfileinfo mode $path)
+	ftype=$(zpm pkgfileinfo filetype $path)
 	owner=$(zpm pkgfileinfo username $path)
 	group=$(zpm pkgfileinfo groupname $path)
-	ftype=$(zpm pkgfileinfo filetype $path)
+
 	name=$(basename -- $path)
+	dir=$(dirname -- $path)
 
 	if [ "$pkgroot" != '/' ]; then
-		dir=$pkgroot/$(dirname -- $path)
+		dir=$pkgroot/$dir
 		dir=${dir%/.}
 		if [ "$dir" = "//" ]; then dir=/ ; fi
-	else
-		dir=''
 	fi
 
 	tmppath=$dir/.installing.$name
-- 
2.40.0