rework zpm-merge

[zpackage] / zpm-install

diff --git a/zpm-install b/zpm-install
index 0cb0281b36cce820622adee08cc9dafcb8b9fe51..8d92ff7e5e51baddde1603c6e3c3dd856ebab275 100755 (executable)
--- 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
 
@@ -188,9 +188,11 @@ zpm syncfs $syncopts
 
 syncrv=$?
 
-for pkgid in $pkglist; do
-       zpm pkg $pkgid status=dryrun
-done
+if [ $dryrun -gt 0 ]; then
+       for pkgid in $pkglist; do
+               zpm pkg $pkgid status=dryrun
+       done
+fi
 
 if [ $syncrv -ne 0 ]; then
        zpm pkg $pkgid status=failed
@@ -214,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
 
@@ -230,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