X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-install;h=64b064bf7170d90e4b85f9e12b53374f41a82946;hb=50b0480e6259c1e4bed6e6dc7990e080ceb5e855;hp=22192710afd1ccb589f959475f5ba27e30d84130;hpb=6b5150de70d70d49360fb3804af8136f442dffc1;p=zpackage

diff --git a/zpm-install b/zpm-install
index 2219271..64b064b 100755
--- a/zpm-install
+++ b/zpm-install
@@ -1,7 +1,12 @@
 #!/bin/sh
 
+warn() {
+	echo $* 1>&2
+}
+
 die() {
 	echo $* 1>&2
+	zpm log -i -a 'aborting install' -t "$pkgid" "$*"
 	exit 1
 }
 
@@ -84,7 +89,7 @@ package=$(zpm quote "$name")
 pkgver=$(zpm quote "$version")
 pkgrel=$(zpm quote "$release")
 
-if [ -z "$rootdir" ]; then
+if [ -n "$rootdir" ]; then
 	: rootdir=${rootdir%%/}
 fi
 
@@ -93,6 +98,9 @@ if [ -z "$localdb" ]; then
 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
@@ -137,11 +145,9 @@ if [ -n "$rootdir" ]; then
 	export ZPM_ROOT_DIR
 fi
 
-# TODO mark already installed packages as updating?
 for pkgstr in "$@"; do
 	pkgid=$(zpm findpkg -f $pkgfile $pkgstr)
 	if [ $? -ne 0 ]; then
-		# TODO log
 		die "can't find package $pkgstr in $pkgfile"
 	fi
 
@@ -156,22 +162,31 @@ for pkgstr in "$@"; do
 	current=$(zpm list -s installed "$package")
 	
 	if [ $runscripts -gt 0 ]; then
-		zpm runscript -f $pkgfile -p pre-install $pkgid $current
+		# TODO run pre-upgrade script if needed
+		# zpm runscript -p pre-upgrade $current $pkgid
+		zpm script -f $pkgfile -p pre-install $pkgid $current
 		if [ $? -ne 0 ]; then
-			# TODO log
 			die "pre-install script for $pkgid failed"
 		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
 			die "merging $pkgid failed"
 		fi
+	else
+		zpm pkg $pkgid status=installing
 	fi
-	# TODO but need to mark as installing if not merged
 
 	#zpm shell $ZPMDB 'select * from install_status' 1>&2
 	if [ $dryrun -gt 0 ]; then
@@ -189,11 +204,12 @@ for pkgstr in "$@"; do
 	zpm syncfs $syncopts -f $pkgfile
 
 	if [ $? -ne 0 ]; then
+		zpm pkg $pkgid status=failed
 		die 'zpm-syncfs failed';
 	fi
 
 	if [ $runscripts -gt 0 ]; then
-		zpm runscript -f $pkgfile -p post-install $pkgid $current
+		zpm script -f $pkgfile -p post-install $pkgid $current
 	fi
 
 	if [ -n "$current" ]; then
@@ -203,7 +219,9 @@ for pkgstr in "$@"; do
 	fi
 
 	if [ $(id -u) -eq 0 ]; then
-		if [ -f $rootdir/sbin/ldconfig ]; 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:-/}
@@ -215,6 +233,8 @@ for pkgstr in "$@"; do
 	# TODO skip configure if not on a terminal, regardless of settings
 	# TODO will need force option
 	if [ $runconfigure -gt 0 ]; then
-		zpm runscript -f $pkgfile -p configure $pkgid $current
+		zpm script -f $pkgfile -p configure $pkgid $current
+	else
+		true
 	fi
 done