From 6cd290b379076aa17eed531cb23585b20cae3a37 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Sat, 24 Nov 2018 01:26:45 +0000 Subject: [PATCH] rewrite zpm-install zpm-install can now install more than one package at a time, and will install all packages in a given file if none are specified, or if the -a option is given. Once zpm-list defaults to only listing the latest packages, zpm-install will try to install the latest of any given package, instead of multiple versions. That is, zpm-install calls 'zpm list', and uses whatever comes back. --- t/install.t | 11 ++++- zpm-install | 137 ++++++++++++++++++++++------------------------------ 2 files changed, 67 insertions(+), 81 deletions(-) diff --git a/t/install.t b/t/install.t index 31fa265..c7efc77 100755 --- a/t/install.t +++ b/t/install.t @@ -6,7 +6,7 @@ . tap.sh -plan 62 +plan 67 owner=$(id -un) group=$(id -gn) @@ -210,6 +210,15 @@ tryrun zpm uninstall -R. -d local.db third-1.0-1 test -f bin/echo failsok bin/echo removed +pkgid=fifth-1.0-1 +PF=$pkgid.zpm +newpkg $pkgid /bin/head +#zpm list -f $PF 2>&1 | diagstdin +skiponfail 1 "can't create $pkgid" || { + tryrun zpm install -R. -d local.db -f $PF 2>/dev/null + okexit "install with implicit package id" +} + cd .. || bailout require rm -rf tmp diff --git a/zpm-install b/zpm-install index 64b064b..911ebf7 100755 --- a/zpm-install +++ b/zpm-install @@ -17,9 +17,10 @@ runconfigure=1 absorb=0 overwrite=0 syncopts='' +installall=0 # zpm-install [-SCn] [ -d localdb ] [ -f pkgfile ] [ -R installroot ] pkgstr ... -while getopts f:d:R:nSCvAO opt; do +while getopts f:d:R:nSCvAOa opt; do case $opt in f) pkgfile="$OPTARG" ;; d) localdb="$OPTARG" ;; @@ -27,6 +28,7 @@ while getopts f:d:R:nSCvAO opt; do S) runscripts=0 ;; C) runconfigure=0 ;; A) absorb=1; syncopts="${syncopts} -A" ;; + a) installall=1; ;; O) overwrite=1; syncopts="${syncopts} -O" ;; n) dryrun=1 ;; v) verbose=1 ;; @@ -35,60 +37,32 @@ while getopts f:d:R:nSCvAO opt; do done shift $(( OPTIND - 1)) -pkgid=$1 - -if [ -z "$pkgid" ]; then - die "must specify pkgid" +if [ -z "$1" ]; then + installall=1 fi -eval "$(zpm parse -E $pkgid)" - if [ -z "$pkgfile" ]; then pkgfile=$ZPM_PACKAGE_FILE fi -# cases R = full package id, F = specified package file - -# immediate error -# -- 00 error, must specify something -if [ -z "$release" ] && [ -z "$pkgfile" ]; then - die must specify package file or complete package id -fi - -# TODO look in package file -# -F 01 error, wouldn't know which pkgid to create, could derive from file? -if [ -z "$release" ]; then - # must have package file, or would have died above - pkgid=$(zpm findpkg -f $pkgfile $pkgid) - if [ -n "$pkgid" ]; then - eval "$(zpm parse -E $pkgid)" - fi -fi - -if [ -z "$pkgid" ]; then - die "$0 can't figure out a package id" +if [ $installall -eq 1 ]; then + pkglist="$(zpm list -f $pkgfile)" +else + pkglist=$(zpm findpkg -f $pkgfile "$1") fi -# set file from pkgid -# R- 10 set file from pkgid, create in file, error if no file -if [ -z "$pkgfile" ]; then - pkgfile="$pkgid.zpm" +if [ $verbose -gt 0 ]; then + echo $pkglist fi -# will now be one of these -# RF 11 create package in file, error if file doesn't exist -if [ ! -f "$pkgfile" ]; then - die $pkgfile does not exist +if [ -z "$pkglist" ]; then + die "$0 no packages specified for install" fi if [ "$idempotent" = 1 ]; then idempotent='or ignore' fi -package=$(zpm quote "$name") -pkgver=$(zpm quote "$version") -pkgrel=$(zpm quote "$release") - if [ -n "$rootdir" ]; then : rootdir=${rootdir%%/} fi @@ -128,7 +102,7 @@ if [ $var -gt 0 ]; then zpm list -v -f $localdb -s installing die "already ($localdb) installing $var package(s)" fi -# check if we're installing something already +# check if we're removing something already var=$(zpm list -f $localdb -s removing | wc -l) if [ $var -gt 0 ]; then zpm list -v -f $localdb -s removing @@ -145,20 +119,13 @@ if [ -n "$rootdir" ]; then export ZPM_ROOT_DIR fi -for pkgstr in "$@"; do - pkgid=$(zpm findpkg -f $pkgfile $pkgstr) - if [ $? -ne 0 ]; then - die "can't find package $pkgstr in $pkgfile" - fi - +for pkgid in $pkglist; do curstatus=$(zpm pkg $pkgid status) if [ "$curstatus" = 'installed' ]; then die "$pkgid already installed" fi - eval $(zpm parse -E $pkgid) - - #zpm list -v + package=$(zpm parse -n $pkgid) current=$(zpm list -s installed "$package") if [ $runscripts -gt 0 ]; then @@ -180,34 +147,58 @@ for pkgstr in "$@"; do # only merge if localdb and pkgfile are different if [ "$pkgfile" != "$ZPMDB" ]; then zpm rmpackage $pkgid - zpm merge -f $pkgfile -s installing $pkgid + if [ $verbose -gt 0 ]; then + echo merging $pkgid + fi + zpm merge -u -F -f $pkgfile -s installing $pkgid if [ $? -ne 0 ]; then die "merging $pkgid failed" fi else zpm pkg $pkgid status=installing fi +done - #zpm shell $ZPMDB 'select * from install_status' 1>&2 - if [ $dryrun -gt 0 ]; then - #zpm list -v - #zpm shell $ZPMDB 'select * from install_status' - zpm syncfs $syncopts -nv -f $pkgfile - zpm pkg $pkgid status=dryrun - continue - fi +# do the sync - if [ $verbose -gt 0 ]; then - syncopts="${syncopts} -v" - fi +#zpm shell $ZPMDB 'select * from install_status' 1>&2 +if [ $dryrun -gt 0 ]; then + syncopts="$syncopts -n" +fi - zpm syncfs $syncopts -f $pkgfile +if [ $verbose -gt 0 ]; then + syncopts="$syncopts -v" +fi - if [ $? -ne 0 ]; then - zpm pkg $pkgid status=failed - die 'zpm-syncfs failed'; +zpm syncfs $syncopts + +syncrv=$? + +for pkgid in $pkglist; do + zpm pkg $pkgid status=dryrun +done + +if [ $syncrv -ne 0 ]; then + zpm pkg $pkgid status=failed + die 'zpm-syncfs failed'; +fi + +if [ $(id -u) -eq 0 ]; then + if [ ! -d $rootdir/etc ]; then + warn "no etc directory in $rootdir, skipping ldconfig" + elif [ -f $rootdir/sbin/ldconfig ]; then + $rootdir/sbin/ldconfig -r ${rootdir:-/} + elif [ -f /sbin/ldconfig ]; then + /sbin/ldconfig -r ${rootdir:-/} + else + true fi +fi +for pkgid in $pkglist; do + package=$(zpm parse -n $pkgid) + current=$(zpm list -s installed "$package") + if [ $runscripts -gt 0 ]; then zpm script -f $pkgfile -p post-install $pkgid $current fi @@ -218,23 +209,9 @@ for pkgstr in "$@"; do zpm pkg $pkgid status=installed fi - if [ $(id -u) -eq 0 ]; then - if [ ! -d $rootdir/etc ]; then - warn "no etc directory in $rootdir, skipping ldconfig" - elif [ -f $rootdir/sbin/ldconfig ]; then - $rootdir/sbin/ldconfig -r ${rootdir:-/} - elif [ -f /sbin/ldconfig ]; then - /sbin/ldconfig -r ${rootdir:-/} - else - true - fi - fi - # 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 $current - else - true + zpm script -f $pkgfile -p configure $pkgid fi done -- 2.40.0