From 8758658db49688b7cc7b55603db1b8438775ccc4 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 4 May 2022 23:59:42 +0100 Subject: made help screen colorful --- src/get.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/get.sh') diff --git a/src/get.sh b/src/get.sh index d4a70a0..0107897 100755 --- a/src/get.sh +++ b/src/get.sh @@ -120,16 +120,15 @@ download_packages () { outputs="$outputs ${out_dir}/${checksum}.${package}.xipkg" done fetch_serial $total_download $outputs - - validate_downloads $outputs + ${UNSAFE} || validate_downloads $outputs + echo $outputs >> "${CACHE_DIR}/toinstall" } # validate signatures of downloaded packages # -# outputs: list of xipkg files to verify and install validate_downloads () { local i=0 - ${UNSAFE} || for pkg_file in $@; do + for pkg_file in $@; do ${QUIET} || hbar -T "${LARGE_CIRCLE} validating downloads..." $i $# @@ -140,13 +139,12 @@ validate_downloads () { else i=$((i+1)) fi - done && + done ${QUIET} || hbar -t ${HBAR_COMPLETE} -T "${CHECKMARK} validated downloads" $i $# - - install $@ } -# get and install requested packages +# fetch requested packages +# and ultimately write the list of package files to toinstall # get () { local requested=$@ @@ -154,14 +152,18 @@ get () { local total_download=0 local out="${CACHE_DIR}/deps" + [ "$#" = "0" ] && return 0 + + $DO_SYNC && sync + touch $out resolve_deps $@ for package in $(cat $out); do - if ! package_exists $package; then - missing="$missing $package" + package_exists $package || { + missing="$missing $package" continue - fi + } set -- $(get_package_download_info $package) checksum=$2 -- cgit v1.2.1