X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-add;h=cfce783c2f3cebd10a7066b192fe0a2729f2383f;hb=9e0744460ead27a2fad41a32f48d6b6c97af6e6e;hp=6c753cf900ca8abadc2803a512d7e2c864500d28;hpb=49a5985fd5ea8b77b7196c06b9d407805abe03d8;p=zpackage

diff --git a/zpm-add b/zpm-add
index 6c753cf..cfce783 100755
--- a/zpm-add
+++ b/zpm-add
@@ -48,7 +48,7 @@ while getopts :f:vr:l:P:S:cu:g:NC opt; do
 		c) isconfig=1 ;;
 		u) username="$OPTARG" ;;
 		g) groupname="$OPTARG" ;;
-		v) verbose=1 ;;
+		v) verbose=$((verbose + 1)) ;;
 		C) complete=1 ;;
 		*) echo 'unknown option' $OPTARG; exit 1 ;;
 	esac
@@ -59,7 +59,7 @@ if [ $isconfig -eq 1 ]; then
 	tags="$tags configuration"
 fi
 
-if [ $verbose -gt 1 ]; then
+if [ $verbose -gt 2 ]; then
 	set -x
 fi
 
@@ -118,9 +118,13 @@ for path in $*; do
 	mtime=$(zpm stat -f '%y' $path)
 	uid=$(zpm stat -f '%u' $path)
 	gid=$(zpm stat -f '%g' $path)
+	mode=$(zpm stat -f '%a' $path)
+
+	# only stat the file for the user and group name if not set on the
+	# command line
 	: ${username:=$(zpm stat -f '%U' $path)}
 	: ${groupname:=$(zpm stat -f '%G' $path)}
-	mode=$(zpm stat -f '%a' $path)
+
 	rpath="$path"
 
 	rpath=$(cleanpath "$path")
@@ -133,7 +137,6 @@ for path in $*; do
 	fi
 
 	if [ ! -z "$strip" ]; then
-		echo "stripping $strip"
 		rpath=${rpath#$strip}
 		rpath=${rpath#/}
 	fi
@@ -147,6 +150,9 @@ for path in $*; do
 		rpath="$prefix/$rpath"
 	fi
 
+	# ensure all paths are absolute
+	rpath=/${rpath#/}
+
 	filetype=$(zpm stat -l -f '%t' "$path")
 	hash='NULL'
 	target='NULL'
@@ -176,15 +182,16 @@ for path in $*; do
 	# TODO check that we have such a package,version,release
 	#cat <<EOS
 	zpm shell $pkgfile <<EOS
-PRAGMA foreign_keys = ON;
 begin;
-insert or replace into packagefiles (package,version,release,path,mode,mtime,username,groupname,filetype,hash,target)
-values ('$package', '$pkgver', $pkgrel, '$rpath', '$mode',$mtime, '$username','$groupname','$filetype',$hash,$target);
+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;
 EOS
 
 #printf "%s %s%s\n" $path $rpath ${target:+" -> $target"}
-if [ $verbose -gt 0 ]; then
+if [ $verbose -gt 1 ]; then
+	printf "%s%s %s:%s %s\n" $filetype $mode $username $groupname $path
+elif [ $verbose -gt 0 ]; then
 	printf "%s\n" $path
 fi