X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-install;h=994ed195d14bc5c24ed7a68d4b0e24eaaa9bba1a;hb=f12e588273d9a3ffc97c20a7075845dff68905e4;hp=26095d26bd0ec80ba48e489e7cdbf9d5a18278dd;hpb=db5b9b705b37e49304260cdf78a4422971efed24;p=zpackage

diff --git a/zpm-install b/zpm-install
index 26095d2..994ed19 100755
--- a/zpm-install
+++ b/zpm-install
@@ -1,109 +1,168 @@
 #!/bin/sh
 
-#package=${1:-$ZPMPACKAGE}
-pkgver=${ZPMPACKAGEVER:-1.0}
-pkgrel=${ZPMPACKAGEREL:-1}
-
-pkgroot=/
-
-# allocate an install id, perhaps hash package and timestamp
-# installid=$(echo $(date) $pkglist | zpm hash)
-
-# extract pre-scripts and run them
-# get list of paths to install
-# for each path, if directory, create and set mode
-# for each path, create leading directories
-# extract to something like /var/tmp/.hash, with low perms
-# only atomic if same filesystem, so use .installid.hash in the
-# install directory
-# set perms and such
-# move into place
-# after all the files, extract post scripts and run them
-
-# also need to mark package as installing so if it fails part way
-# through, it can be finished later
-# probably also want an option to "backup" any packages being upgraded
-# so it's trivial to downgrade or to revert if the install fails
-
-# option for "multipackage" just to let the system know that's what you meant
-# option to take filenames from stdin
-# parse package, version, release from file if not given
-# TODO what's the difference between prefix and pkgroot
-# need an option to not chown the files
-# option to install but not merge/track
-while getopts :f:v:r:d:a:u:l:p:b:P:R: opt; do
+die() {
+	echo $* 1>&2
+	exit 1
+}
+
+dryrun=0
+verbose=0
+runscripts=1
+runconfigure=1
+localdb=/var/lib/zpm/local.db
+
+# zpm-install [-SCn] [ -d localdb ] [ -f pkgfile ] [ -R installroot ] pkgstr ...
+while getopts f:d:R:nSCv opt; do
 	case $opt in
-		R) pkgroot="$OPTARG" ;;
 		f) pkgfile="$OPTARG" ;;
-		v) pkgver="$OPTARG" ;;
-		r) pkgrel="$OPTARG" ;;
-		d) description="$OPTARG" ;;
-		a) arch="$OPTARG" ;;
-		u) url="$OPTARG" ;;
-		l) licenses="$OPTARG" ;;
-		p) packager="$OPTARG" ;;
-		b) builddate="$OPTARG" ;;
-		P) prefix="$OPTARG" ;;
+		d) localdb="$OPTARG" ;;
+		R) rootdir="$OPTARG" ;;
+		S) runscripts=0 ;;
+		C) runconfigure=0 ;;
+		n) dryrun=1 ;;
+		v) verbose=1 ;;
+		*) die "usage ..." ;;
 	esac
 done
-shift $((OPTIND - 1))
+shift $(( OPTIND - 1))
 
-die() {
-	echo $* 1>&2
-	exit 1
-}
+pkgid=$1
+
+if [ -z "$pkgid" ]; then
+	die "must specify pkgid"
+fi
+
+eval "$(zpm parse -E $pkgid)"
+
+if [ -z "$pkgfile" ]; then
+	pkgfile=$ZPM_PACKAGE_FILE
+fi
 
+# cases C = create ok, R = full package id, F = specified package file
+
+# immediate error
+# C-- 100 error, must specify something
+# --- 000 error, must specify something
+if [ -z "$release" ] && [ -z "$pkgfile" ]; then
+	die must specify package file or complete package id
+fi
+
+# TODO look in package file
+# --F 001 error, wouldn't know which pkgid to create, could derive from file?
+# C-F 101 error, since package wouldn't exist in file to find
+if [ -z "$release" ]; then
+	die must specify complete package id
+fi
+
+# set file from pkgid
+# CR- 110 set file from pkgid, create if needed
+# -R- 010 set file from pkgid, create in file, error if no file
 if [ -z "$pkgfile" ]; then
-	# actually, if no pkgfile, get pkgfile from repo
-	# but need to loop over finding package files then
-	# so this program probably needs to be "install from pkgfile"
-	# and a separate one that will loop over a package
-	# spec list and find from repos
-	die "must specify package file" 
-	pkgfile="$package-$pkgver-$pkgrel.zpm"
+	pkgfile="$pkgid.zpm"
+fi
+
+# will now be one of these
+# CRF 111 create package in file given, create file if needed
+# -RF 011 create package in file, error if file doesn't exist
+if [ ! -f "$pkgfile" ]; then
+	if [ $create -eq 1 ]; then
+		zpm init $pkgfile
+	else
+		die $pkgfile does not exist
+	fi
+fi
+
+if [ "$idempotent" = 1 ]; then
+	idempotent='or ignore'
 fi
 
-set -e
-zpm test -v $pkgfile
+package=$(zpm quote "$name")
+pkgver=$(zpm quote "$version")
+pkgrel=$(zpm quote "$release")
+
+ZPMDB=$localdb
+export ZPMDB
 
-if [ $# -gt 0 ]; then
-	pkglist="$@"
+if [ -z "$ZPMDB" ]; then
+	die "no local db"
 else
-	pkglist=$(zpm findpkg $pkgfile)
+	#echo "localdb = $ZPMDB"
+	true
 fi
 
-pathlist() {
-	zpm shell $pkgfile<<EOS
-select path from packagefiles
-	where package||'-'||version||'-'||release = '$pkg'
-	;
-EOS
-}
+zpm test -v "$ZPMDB" || die "$ZPMDB is not a zpm database"
 
-for pkg in $pkglist; do
-	# TODO find scripts marked as pre-install
-	# TODO if this is an upgrade, run pre-upgrade
-
-	# TODO get total size of install so we can do a progress bar
-
-	# add package info to local package db
-	# zpm merge -L -f $pkgfile $pkg
-	# check for conflicts
-	# mark package in localdb as installing
-	# zpm setmark installing $pkg
-	# install all the files for a package
-	# TODO install directories first in order of path length
-	echo installing $pkglist
-	filecount=$(pathlist | wc -l)
-	echo $filecount files
-	pathlist
-	pathlist | xargs -t zpm ipkgfile -R "$pkgroot" -f $pkgfile -- $pkg
-
-	# TODO find scripts marked as post-install
-	# TODO if this is an upgrade, run post-upgrade
-
-	# mark as ready for install
-	#zpm setmark ready $pkg
-done
+# check if we're installing something already
+var=$(zpm list -f $localdb -s installing | wc -l)
+if [ $var -gt 0 ]; then
+	zpm list -v -f $localdb -s installing 
+	die "already ($localdb) installing $var package(s)"
+fi
+
+if [ -n "$rootdir" ]; then
+	ZPM_ROOT_DIR="$rootdir"
+	export ZPM_ROOT_DIR
+fi
 
-#zpm setmark installed $pkglist
+# TODO mark already installed packages as updating?
+for pkgstr in "$@"; do
+	pkgid=$(zpm findpkg $pkgfile $pkgstr)
+	if [ $? -ne 0 ]; then
+		# TODO log
+		die "can't find package $pkgstr in $pkgfile"
+	fi
+
+	curstatus=$(zpm pkg $pkgid status)
+	if [ "$curstatus" = 'installed' ]; then
+		die "$pkgid already installed"
+	fi
+
+	eval $(zpm parse -E $pkgid)
+
+	current=$(zpm list -s installed "$package")
+	
+	if [ $runscripts -gt 0 ]; then
+		zpm runscript -f $pkgfile -p pre-install $pkgid $current
+		if [ $? -ne 0 ]; then
+			# TODO log
+			die "pre-install script for $pkgid failed"
+		fi
+	fi
+
+	# only merge if localdb and pkgfile are different
+	if [ "$pkgfile" != "$ZPMDB" ]; then
+		zpm merge -f $pkgfile -s installing $pkgid
+		if [ $? -ne 0 ]; then
+			# TODO log
+			die "merging $pkgid failed"
+		fi
+	fi
+
+	if [ $dryrun -gt 0 ]; then
+		#zpm list -v
+		#zpm shell $ZPMDB 'select * from install_status'
+		zpm pkgfiles -nv -f $pkgfile $pkgid
+		zpm pkg $pkgid status=dryrun
+		continue
+	fi
+
+	zpm pkgfiles -f $pkgfile $pkgid
+
+	if [ $? -ne 0 ]; then
+		die 'zpm-pkgfiles failed';
+	fi
+
+	if [ $runscripts -gt 0 ]; then
+		zpm runscript -f $pkgfile -p post-install $pkgid $current
+	fi
+
+	if [ -n "$current" ]; then
+		zpm pkg $pkgid status=installed :$current status=updated
+	else
+		zpm pkg $pkgid status=installed
+	fi
+
+	if [ $runconfigure -gt 0 ]; then
+		zpm runscript -f $pkgfile -p configure $pkgid $current
+	fi
+done