diff --git a/src/main.sh b/src/main.sh index a837c1f..58c34d7 100644 --- a/src/main.sh +++ b/src/main.sh @@ -1,7 +1,7 @@ #!/bin/sh # ordered requirements -%include util.sh env.sh options.sh config.sh +%include util.sh env.sh print.sh options.sh config.sh # everything else %include *.sh @@ -61,11 +61,11 @@ info) fi ;; install) - fetch_pkglist $sudo > $_OUTPUT || exit $? if [ -z "$2" ] then echo "No package specified" >&2 else + fetch_pkglist $sudo > $_OUTPUT || exit $? shift 1 pkglist=$(LOG=true resolve_packages $*) || exit $? pkglist=$(INCLUDE_PACKAGES=true resolve_deps $* | tr '\n' ' ') diff --git a/src/print.sh b/src/print.sh index 1903c02..c55d601 100644 --- a/src/print.sh +++ b/src/print.sh @@ -30,7 +30,7 @@ Config file (zpkg.conf): SSH_ADDRESS SSH access for deploy HTTP_ADDRESS HTTP address for downloading packages PKG_PATH Path to the local package database - COMPRESSION Compression configuration, extension:binary:parallel_binary:options + COMPRESSION Compression configuration, format: extension:binary:parallel_binary:options. Default: xz:xz:pixz ALLOW_ROOT Set to true to allow running as root without -f. Default: false UPDATE_REMOVE Remove packages on update. Default: true Config can be overwritten by environment by appending 'ZPKG_' to the corresponding variable" @@ -75,9 +75,9 @@ package_info() { printf "Name: %s\n" "$1" printf "Description: %s\n" "$desc" - echo "" - printf "Status: %s\n" "$status" + printf "Status: %s\n" "$status" printf "Dependencies: %s\n" "$deps" printf "Package size: %s\n" "$csize" printf "Installed size: %s\n" "$isize" + printf "" }