X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-install;h=29d8c5d2fc270f0299bc5ecfcbbd46b280c405e1;hb=9d52e76ca7992bf2f38868dbcf9c84a7cc1484c9;hp=7c7fff1d5f2e55ba2cd6844fcffdd1574cbebb63;hpb=5a5fb3563c6eaee14fb03fae46c1b5612a7c8d57;p=zpackage

diff --git a/zpm-install b/zpm-install
index 7c7fff1..29d8c5d 100755
--- a/zpm-install
+++ b/zpm-install
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+warn() {
+	echo $* 1>&2
+}
+
 die() {
 	echo $* 1>&2
 	exit 1
@@ -9,16 +13,20 @@ dryrun=0
 verbose=0
 runscripts=1
 runconfigure=1
-localdb=/var/lib/zpm/local.db
+absorb=0
+overwrite=0
+syncopts=''
 
 # zpm-install [-SCn] [ -d localdb ] [ -f pkgfile ] [ -R installroot ] pkgstr ...
-while getopts f:d:R:nSCv opt; do
+while getopts f:d:R:nSCvAO opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
 		d) localdb="$OPTARG" ;;
 		R) rootdir="$OPTARG" ;;
 		S) runscripts=0 ;;
 		C) runconfigure=0 ;;
+		A) absorb=1; syncopts="${syncopts} -A" ;;
+		O) overwrite=1; syncopts="${syncopts} -O" ;;
 		n) dryrun=1 ;;
 		v) verbose=1 ;;
 		*) die "usage ..." ;;
@@ -38,38 +46,38 @@ if [ -z "$pkgfile" ]; then
 	pkgfile=$ZPM_PACKAGE_FILE
 fi
 
-# cases C = create ok, R = full package id, F = specified package file
+# cases R = full package id, F = specified package file
 
 # immediate error
-# C-- 100 error, must specify something
-# --- 000 error, must specify something
+# -- 00 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
+# -F 01 error, wouldn't know which pkgid to create, could derive from file?
 if [ -z "$release" ]; then
-	die must specify complete package id
+	# must have package file, or would have died above
+	pkgid=$(zpm findpkg -f $pkgfile $pkgid)
+	if [ -n "$pkgid" ]; then
+		eval "$(zpm parse -E $pkgid)"
+	fi
+fi
+
+if [ -z "$pkgid" ]; then
+	die "$0 can't figure out a 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
+# R- 10 set file from pkgid, create in file, error if no file
 if [ -z "$pkgfile" ]; then
 	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
+# RF 11 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
+	die $pkgfile does not exist
 fi
 
 if [ "$idempotent" = 1 ]; then
@@ -80,6 +88,27 @@ package=$(zpm quote "$name")
 pkgver=$(zpm quote "$version")
 pkgrel=$(zpm quote "$release")
 
+if [ -n "$rootdir" ]; then
+	: rootdir=${rootdir%%/}
+fi
+
+if [ -z "$localdb" ]; then
+	localdb=${rootdir}/var/lib/zpm/local.db
+fi
+
+if [ ! -f "$localdb" ]; then
+	if [ -n "$rootdir" ] && [ ! -d $rootdir ]; then
+		mkdir $rootdir || die "can't create $rootdir: $!"
+	fi
+	for d in /var /var/lib /var/lib/zpm; do
+		test -d $rootdir/$d || mkdir $rootdir/$d || die "can't create $rootdir/$d/: $!"
+	done
+	zpm init "$localdb"
+	if [ $? -ne 0 ]; then
+		die "aborting install"
+	fi
+fi
+
 ZPMDB=$localdb
 export ZPMDB
 
@@ -98,6 +127,17 @@ if [ $var -gt 0 ]; then
 	zpm list -v -f $localdb -s installing 
 	die "already ($localdb) installing $var package(s)"
 fi
+# check if we're installing something already
+var=$(zpm list -f $localdb -s removing | wc -l)
+if [ $var -gt 0 ]; then
+	zpm list -v -f $localdb -s removing 
+	die "already ($localdb) removing $var package(s)"
+fi
+var=$(zpm list -f $localdb -s updating | wc -l)
+if [ $var -gt 0 ]; then
+	zpm list -v -f $localdb -s updating 
+	die "already ($localdb) updating $var package(s)"
+fi
 
 if [ -n "$rootdir" ]; then
 	ZPM_ROOT_DIR="$rootdir"
@@ -106,7 +146,7 @@ fi
 
 # TODO mark already installed packages as updating?
 for pkgstr in "$@"; do
-	pkgid=$(zpm findpkg $pkgfile $pkgstr)
+	pkgid=$(zpm findpkg -f $pkgfile $pkgstr)
 	if [ $? -ne 0 ]; then
 		# TODO log
 		die "can't find package $pkgstr in $pkgfile"
@@ -123,6 +163,8 @@ for pkgstr in "$@"; do
 	current=$(zpm list -s installed "$package")
 	
 	if [ $runscripts -gt 0 ]; then
+		# TODO run pre-upgrade script if needed
+		# zpm runscript -p pre-upgrade $current $pkgid
 		zpm runscript -f $pkgfile -p pre-install $pkgid $current
 		if [ $? -ne 0 ]; then
 			# TODO log
@@ -130,8 +172,16 @@ for pkgstr in "$@"; do
 		fi
 	fi
 
+	# remove the package if it exists.  can't be in an installed
+	# state, would have bailed above.  So, if it exists, can only
+	# be 'upgraded'.  This should be fast, because we won't run
+	# a garbage collect, so any possible duplicate files between
+	# an upgraded or removed files, if they're there, won't need
+	# to be merged.
+
 	# only merge if localdb and pkgfile are different
 	if [ "$pkgfile" != "$ZPMDB" ]; then
+		zpm rmpackage $pkgid
 		zpm merge -f $pkgfile -s installing $pkgid
 		if [ $? -ne 0 ]; then
 			# TODO log
@@ -144,15 +194,19 @@ for pkgstr in "$@"; do
 	if [ $dryrun -gt 0 ]; then
 		#zpm list -v
 		#zpm shell $ZPMDB 'select * from install_status'
-		zpm pkgfiles -nv -f $pkgfile
+		zpm syncfs $syncopts -nv -f $pkgfile
 		zpm pkg $pkgid status=dryrun
 		continue
 	fi
 
-	zpm pkgfiles -f $pkgfile
+	if [ $verbose -gt 0 ]; then
+		syncopts="${syncopts} -v"
+	fi
+
+	zpm syncfs $syncopts -f $pkgfile
 
 	if [ $? -ne 0 ]; then
-		die 'zpm-pkgfiles failed';
+		die 'zpm-syncfs failed';
 	fi
 
 	if [ $runscripts -gt 0 ]; then
@@ -165,6 +219,18 @@ for pkgstr in "$@"; do
 		zpm pkg $pkgid status=installed
 	fi
 
+	if [ $(id -u) -eq 0 ]; then
+		if [ ! -d $rootdir/etc ]; then
+			warn "no etc directory in $rootdir, skipping ldconfig"
+		elif [ -f $rootdir/sbin/ldconfig ]; then
+			$rootdir/sbin/ldconfig -r ${rootdir:-/}
+		elif [ -f /sbin/ldconfig ]; then
+			/sbin/ldconfig -r ${rootdir:-/}
+		else
+			true
+		fi
+	fi
+
 	# TODO skip configure if not on a terminal, regardless of settings
 	# TODO will need force option
 	if [ $runconfigure -gt 0 ]; then