# 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" ;;
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
die
fi
+for package in $merge; do
+ pkgid=${package%:*}
+ installlist="$installlist $pkgid"
+done
+installlist=${installlist#' '}
+
if [ $justlist -eq 1 ]; then
for package in $merge; do
pkgid=${package%:*}
exit 0
fi
-test -n "$merge" && echo "install: $merge"
+test -n "$merge" && echo "install: $installlist"
test -n "$to_remove" && echo "remove: $to_remove"
# finally, merge everything
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
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"