X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;ds=sidebyside;f=zpm-ipkgfile;h=088f807a805a3e6f0139897373d8258da0baddc0;hb=d30b60f479a576d52ff6bed022914806aaebdcb8;hp=0f9440c9c928256f2dfb63b663e68833772f7940;hpb=ecdd57da7df775c039aee834e1f74172004f352b;p=zpackage

diff --git a/zpm-ipkgfile b/zpm-ipkgfile
index 0f9440c..088f807 100755
--- a/zpm-ipkgfile
+++ b/zpm-ipkgfile
@@ -1,10 +1,81 @@
 #!/bin/sh
 
-pkgfile=$1
+# install a file from a package
+# -f pkgfile
+# -R root of pkg
+# -P prefix to file
+# -S strip prefix
+# -p pkgname
+
+pkgroot=/
+
+while getopts :f:v:r:d:a:u:l:p:b:P:R: opt; do
+        case $opt in
+                R) pkgroot="$OPTARG" ;;
+                f) pkgfile="$OPTARG" ;;
+                v) pkgver="$OPTARG" ;;
+                r) pkgrel="$OPTARG" ;;
+                P) prefix="$OPTARG" ;;
+        esac
+done
+shift $((OPTIND - 1))
+
+die() {
+	echo $* 1>&2
+	exit 1
+}
+
+pkgfileinfo() {
+	zpm shell $pkgfile<<EOS
+select $1 from packagefiles
+	where path='$2'
+	and package||'-'||version||'-'||release = '$pkg'
+	;
+EOS
+}
+
+# if not from a package file, from local db
+if [ -z "$pkgfile" ]; then
+	die "installing from non-pkgfile not supported"
+fi
+
+pkg="$1"
 shift
 
+set -e
 for path in $*; do
-	mkdir -p tmp/$(dirname $path)
-	fhash=$(sqlite3 $pkgfile "select hash from packagefiles where path = '$path';")
-	./zpm-extract $pkgfile $fhash ./tmp/$path
+	fhash=$(zpm pkgfileinfo hash $path)
+	mode=$(zpm pkgfileinfo mode $path)
+	owner=$(zpm pkgfileinfo username $path)
+	group=$(zpm pkgfileinfo groupname $path)
+	ftype=$(zpm pkgfileinfo filetype $path)
+	name=$(basename -- $path)
+
+	if [ "$pkgroot" != '/' ]; then
+		dir=$pkgroot/$(dirname -- $path)
+		dir=${dir%/.}
+		if [ "$dir" = "//" ]; then dir=/ ; fi
+	else
+		dir=''
+	fi
+
+	tmppath=$dir/.installing.$name
+
+	# can't use install because it's not posix.
+	# probably worth writing a zpm-install, but with
+	# a different name since that wants to be a package install
+	# probably makes the most sense for extract to know how
+	# to do the extract to temp and such, then
+	# you can just add the -S option (secure)
+	#cat <<-EOC
+	set -x
+	mkdir -p $dir
+	zpm extract $pkgfile $fhash $tmppath 0
+	chown $owner:$group $tmppath
+	chmod $mode $tmppath
+	# TODO mv -n non-posix, going to need to have extract do all
+	# of this
+	mv -n $tmppath $dir/$name
+	set +x
+	#EOC
 done