X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-ipkgfile;fp=zpm-ipkgfile;h=a7be95a862fdecdeaf6a9b1634bdfa49ce2cc9dc;hb=db5b9b705b37e49304260cdf78a4422971efed24;hp=088f807a805a3e6f0139897373d8258da0baddc0;hpb=d4a843be76cd1f93f4b143e3df9516629b3b18fa;p=zpackage

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