fix compile process for elf programs

[zpackage] / zpm-update

diff --git a/zpm-update b/zpm-update
index fcfb81668887476ce4aa872a051cb262dd312d92..39c111a2f17f6e7274bac7f298f09834b8e427ea 100755 (executable)
--- a/zpm-update
+++ b/zpm-update
@@ -109,7 +109,7 @@ uninstall=0
 
 # TODO option to attempt to resume an ongoing install
 # zpm-install [-SCn] [ -d localdb ] [ -f pkgfile ] [ -R installroot ] pkgstr ...
-while getopts f:d:R:nSCvAObBLUz opt; do
+while getopts f:d:R:nSCvAObBLUzp opt; do
        case $opt in
                f) pkgfile="$OPTARG" ;;
                d) localdb="$OPTARG" ;;
@@ -128,13 +128,26 @@ while getopts f:d:R:nSCvAObBLUz opt; do
                l) justlist=1 ;;
                U) uninstall=1 ;;
                z) pullrepos=0 ;;
+               p) syncopts="$syncopts -p" ;;
                *) die "usage ..." ;;
        esac
 done
-shift $(( OPTIND - 1))
+shift $(( OPTIND - 1 ))
+
+if [ -n "$rootdir" ]; then
+       : rootdir=${rootdir%%/}
+       ZPM_ROOT_DIR=$rootdir
+       export ZPM_ROOT_DIR
+fi
+
+if [ -n "$localdb" ]; then
+       ZPMDB=$localdb
+elif [ -z "$ZPMDB" ]; then
+       ZPMDB="$ZPM_ROOT_DIR/var/lib/zpm/local.db"
+fi
 
-ZPMDB=${localdb:-${ZPMDB:-/var/lib/zpm/local.db}}
 export ZPMDB
+
 # create the localdb if needed
 zpm init $ZPMDB
 
@@ -290,7 +303,9 @@ done
 
 to_install=${to_install#' '}
 
-echo "installing: $to_install"
+if [ -n "$to_install" ]; then
+       echo "installing: $to_install"
+fi
 
 # absorb anything we're updating or removing, if absorb flag set
 
@@ -320,12 +335,6 @@ if [ -n "$to_remove" ]; then
        done
 fi
 
-if [ -n "$rootdir" ]; then
-       ZPM_ROOT_DIR=$rootdir
-       export ZPM_ROOT_DIR
-       : rootdir=${rootdir%%/}
-fi
-
 if [ $dryrun -gt 0 ]; then
        runscripts=0 # we don't want to run post scripts on a dry-run
        syncopts="$syncopts -n"