X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-add;h=d5fca8e2b225c0b05ae130c92e8ab3b3a273005c;hb=5405c7c75dc410d93818fabdfa290dbaa4505aac;hp=7de51e9eb9f5322d135bcb85af375129bef79552;hpb=e41a09e93fc1d4aed061a6aa7a0755fb21092fe3;p=zpackage

diff --git a/zpm-add b/zpm-add
index 7de51e9..d5fca8e 100755
--- a/zpm-add
+++ b/zpm-add
@@ -38,7 +38,12 @@ complete=0
 # option to take filenames from stdin
 # parse package, version, release from file if not given
 # TODO -l follow symlinks, -L follow symlinks, adding all, links and targets
-while getopts :f:vr:l:P:S:cu:g:NC opt; do
+# -T set link target
+# -M set mtime
+# -m set mode
+# -H set hash, will be overridden for regular files unless -N is set
+# -F set filetype, regular, symlink, directory
+while getopts :f:vr:l:P:S:cu:g:NCm:M:T:H:F: opt; do
 	case $opt in
 		N) addcontent=0 ;;
 		f) pkgfile="$OPTARG" ;;
@@ -46,9 +51,14 @@ while getopts :f:vr:l:P:S:cu:g:NC opt; do
 		S) strip=$(cleanpath "$OPTARG"); ;;
 		t) tags="$tags $OPTARG" ;;
 		c) isconfig=1 ;;
-		u) username="$OPTARG" ;;
-		g) groupname="$OPTARG" ;;
-		v) verbose=1 ;;
+		u) cluser="$OPTARG" ;;
+		g) clgroup="$OPTARG" ;;
+		m) clmode="$OPTARG" ;;
+		M) clmtime="$OPTARG" ;;
+		T) cltarget="$OPTARG" ;;
+		F) cltype="$OPTARG" ;;
+		H) clhash="$OPTARG" ;;
+		v) verbose=$((verbose + 1)) ;;
 		C) complete=1 ;;
 		*) echo 'unknown option' $OPTARG; exit 1 ;;
 	esac
@@ -59,7 +69,7 @@ if [ $isconfig -eq 1 ]; then
 	tags="$tags configuration"
 fi
 
-if [ $verbose -gt 1 ]; then
+if [ $verbose -gt 2 ]; then
 	set -x
 fi
 
@@ -115,12 +125,17 @@ pkgrel=$(zpm quote "$release")
 #strip=$(cleanpath "$strip")
 for path in $*; do
 	#echo adding $path
-	mtime=$(zpm stat -f '%y' $path)
-	uid=$(zpm stat -f '%u' $path)
-	gid=$(zpm stat -f '%g' $path)
-	: ${username:=$(zpm stat -f '%U' $path)}
-	: ${groupname:=$(zpm stat -f '%G' $path)}
-	mode=$(zpm stat -f '%a' $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 -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"
 
 	rpath=$(cleanpath "$path")
@@ -133,7 +148,6 @@ for path in $*; do
 	fi
 
 	if [ ! -z "$strip" ]; then
-		echo "stripping $strip"
 		rpath=${rpath#$strip}
 		rpath=${rpath#/}
 	fi
@@ -147,7 +161,9 @@ for path in $*; do
 		rpath="$prefix/$rpath"
 	fi
 
-	filetype=$(zpm stat -l -f '%t' "$path")
+	# ensure all paths are absolute
+	rpath=/${rpath#/}
+
 	hash='NULL'
 	target='NULL'
 	case "$filetype" in
@@ -159,7 +175,11 @@ for path in $*; do
 					die "zpm addfile failed ($?): $pkgfile $path" 
 				fi
 			else
-				hash=$(zpm hash "$path")
+				if [ -z "$clhash" ]; then
+					hash=$(zpm hash "$path")
+				else
+					hash=$clhash
+				fi
 			fi
 			hash="'$hash'"
 			;;
@@ -168,22 +188,35 @@ for path in $*; do
 			;;
 		symlink)
 			filetype=l
-			target=$(readlink $path)
-			target="'$target'"
+			if [ -n "$cltarget" ]; then
+				target=$cltarget
+			else 
+				target=$(readlink $path)
+				target=$(zpm quote -q "$target")
+			fi
+			;;
+		*)
+			die "filetype $filetype not supported"
 			;;
 	esac
 
 	# 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;
-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);
+$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;
 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