X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-install;h=8d92ff7e5e51baddde1603c6e3c3dd856ebab275;hb=18de5ac3f1e533d36a1c394a1381dfaa6f3ce201;hp=c52f0a34c4726b05dee6aa79517f5dd99f1a2138;hpb=0b52926059ddded0d3eeb4c8598b097f7123d7f3;p=zpackage diff --git a/zpm-install b/zpm-install index c52f0a3..8d92ff7 100755 --- a/zpm-install +++ b/zpm-install @@ -139,7 +139,7 @@ for pkgid in $pkglist; do fi else if zpm script -f $pkgfile -Fql -p pre-install $pkgid; then - zpm note -p $pkgid -m 'pre-install script not run' + zpm note -e -p $pkgid -m 'pre-install script not run' fi fi @@ -216,10 +216,10 @@ 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 - zpm note -p $pkgid -m 'post-install script not run' + if zpm script -Fql -p post-install $pkgid; then + zpm note -e -p $pkgid -m 'post-install script not run' fi fi @@ -232,10 +232,10 @@ 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 - zpm note -p $pkgid -m 'configure script not run' + if zpm script -Fql -p configure $pkgid; then + zpm note -e -p $pkgid -m 'configure script not run' fi fi