From: Nathan Wagner <nw@hydaspes.if.org>
Date: Mon, 26 Nov 2018 09:20:37 +0000 (+0000)
Subject: run package scripts from target db
X-Git-Tag: v0.3.0~17
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=982b9cc4e1e5eeaa3ef9eb2e6b6ada729e1ebc61

run package scripts from target db
---

diff --git a/zpm-install b/zpm-install
index 0d2055a..8d92ff7 100755
--- a/zpm-install
+++ b/zpm-install
@@ -216,9 +216,9 @@ for pkgid in $pkglist; do
 	current=$(zpm list -s installed "$package")
 	
 	if [ $runscripts -gt 0 ]; then
-		zpm script -f $pkgfile -p post-install $pkgid $current
+		zpm script -p post-install $pkgid $current
 	else
-		if zpm script -f $pkgfile -Fql -p post-install $pkgid; then
+		if zpm script -Fql -p post-install $pkgid; then
 			zpm note -e -p $pkgid -m 'post-install script not run'
 		fi
 	fi
@@ -232,9 +232,9 @@ for pkgid in $pkglist; do
 	# TODO skip configure if not on a terminal, regardless of settings
 	# TODO will need force option
 	if [ $runconfigure -gt 0 ]; then
-		zpm script -f $pkgfile -p configure $pkgid
+		zpm script -p configure $pkgid
 	else
-		if zpm script -f $pkgfile -Fql -p configure $pkgid; then
+		if zpm script -Fql -p configure $pkgid; then
 			zpm note -e -p $pkgid -m 'configure script not run'
 		fi
 	fi