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

diff --git a/zpm-install b/zpm-install
index 994ed19..a9a748d 100755
--- a/zpm-install
+++ b/zpm-install
@@ -9,7 +9,6 @@ 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
@@ -38,38 +37,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 +79,18 @@ package=$(zpm quote "$name")
 pkgver=$(zpm quote "$version")
 pkgrel=$(zpm quote "$release")
 
+if [ -z "$localdb" ]; then
+	: rootdir=${rootdir%%/}
+	localdb=${rootdir:-/}/var/lib/zpm/local.db
+fi
+
+if [ ! -f "$localdb" ]; then
+	zpm init "$localdb"
+	if [ $? -ne 0 ]; then
+		die "aborting install"
+	fi
+fi
+
 ZPMDB=$localdb
 export ZPMDB
 
@@ -98,6 +109,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 +128,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"
@@ -119,6 +141,7 @@ for pkgstr in "$@"; do
 
 	eval $(zpm parse -E $pkgid)
 
+	#zpm list -v
 	current=$(zpm list -s installed "$package")
 	
 	if [ $runscripts -gt 0 ]; then
@@ -137,19 +160,25 @@ for pkgstr in "$@"; do
 			die "merging $pkgid failed"
 		fi
 	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
 		#zpm list -v
 		#zpm shell $ZPMDB 'select * from install_status'
-		zpm pkgfiles -nv -f $pkgfile $pkgid
+		zpm syncfs -nv -f $pkgfile
 		zpm pkg $pkgid status=dryrun
 		continue
 	fi
 
-	zpm pkgfiles -f $pkgfile $pkgid
+	if [ $verbose -gt 0 ]; then
+		zpm syncfs -v -f $pkgfile
+	else
+		zpm syncfs -f $pkgfile
+	fi
 
 	if [ $? -ne 0 ]; then
-		die 'zpm-pkgfiles failed';
+		die 'zpm-syncfs failed';
 	fi
 
 	if [ $runscripts -gt 0 ]; then
@@ -162,6 +191,18 @@ for pkgstr in "$@"; do
 		zpm pkg $pkgid status=installed
 	fi
 
+	if [ $(id -u) -eq 0 ]; then
+		if [ -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
 		zpm runscript -f $pkgfile -p configure $pkgid $current
 	fi