X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-add;h=d5fca8e2b225c0b05ae130c92e8ab3b3a273005c;hb=6fbdbc82ac30e6beea0e5a5ce0b6fd11311abe2c;hp=28c12f96fef2cd82f6af30b67e79a227f689b788;hpb=903da5cc8edf74516b98027fb67a25eb407c2f4d;p=zpackage

diff --git a/zpm-add b/zpm-add
index 28c12f9..d5fca8e 100755
--- a/zpm-add
+++ b/zpm-add
@@ -125,12 +125,15 @@ pkgrel=$(zpm quote "$release")
 #strip=$(cleanpath "$strip")
 for path in $*; do
 	#echo adding $path
+if [ $verbose -gt 0 ]; then
+	printf "adding %s\n" $path
+fi
 
 	# only stat the file for items not set on the command line
-	mode=${clmode:-$(zpm stat -f '%a' $path)}
-	username=${cluser:-$(zpm stat -f '%U' $path)}
-	groupname=${clgroup:-$(zpm stat -f '%G' $path)}
-	mtime=${clmtime:-$(zpm stat -f '%y' $path)}
+	mode=${clmode:-$(zpm stat -l -f '%a' $path)}
+	username=${cluser:-$(zpm stat -l -f '%U' $path)}
+	groupname=${clgroup:-$(zpm stat -l -f '%G' $path)}
+	mtime=${clmtime:-$(zpm stat -l -f '%y' $path)}
 	filetype=${cltype:-$(zpm stat -l -f '%t' "$path")}
 
 	rpath="$path"
@@ -199,8 +202,12 @@ for path in $*; do
 
 	# TODO check that we have such a package,version,release
 	#cat <<EOS
+	if [ $verbose -gt 2 ]; then
+		shellecho=".echo on"
+	fi
 	zpm shell $pkgfile <<EOS
 begin;
+$shellecho
 insert or replace into packagefiles (package,version,release,path,mode,mtime,username,groupname,filetype,hash,configuration,target)
 values ('$package', '$pkgver', $pkgrel, '$rpath', '$mode',$mtime, '$username','$groupname','$filetype',$hash,$isconfig,$target);
 commit;