X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-install;h=64b064bf7170d90e4b85f9e12b53374f41a82946;hb=0c6d2b1131db0c4b477d52b935ff6a7f52084a3c;hp=35891694d6409268b760e89f786bc262799bb72f;hpb=c5ae43ca2ab5b4a323e6154d0e08c629cc5a5e1d;p=zpackage

diff --git a/zpm-install b/zpm-install
index 3589169..64b064b 100755
--- a/zpm-install
+++ b/zpm-install
@@ -164,7 +164,7 @@ for pkgstr in "$@"; do
 	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
+		zpm script -f $pkgfile -p pre-install $pkgid $current
 		if [ $? -ne 0 ]; then
 			die "pre-install script for $pkgid failed"
 		fi
@@ -209,7 +209,7 @@ for pkgstr in "$@"; do
 	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
@@ -233,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