From 9752813e90d663aab55c33d3877886a9013f36db Mon Sep 17 00:00:00 2001 From: davidovski Date: Tue, 31 May 2022 14:00:39 +0100 Subject: fixed using wrong checksum when downloading packages --- scripts/installer.sh | 2 +- src/build.sh | 2 +- src/get.sh | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/installer.sh b/scripts/installer.sh index 247a565..c974951 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -5,7 +5,7 @@ . /usr/lib/colors.sh logfile="installer.log" -default_packages="base linux xipkg dracut grub mksh sudo neofetch vim" +default_packages="base linux xipkg dracut grub mksh sudo neofetch vim tzdata" additional_services="networkmanager xorg iwd" list_disks () { diff --git a/src/build.sh b/src/build.sh index 8297f25..c10aedb 100644 --- a/src/build.sh +++ b/src/build.sh @@ -19,7 +19,7 @@ get_buildfiles () { } get_deps () { - for f in $BUILDFILES_DIR/repo/*/$1/*.xibuild; do + for f in $BUILDFILES_DIR/repo/$1/*.xibuild; do sed -rn "s/^.*DEPS=\"(.*)\"/\1/p" $f done } diff --git a/src/get.sh b/src/get.sh index ffa5372..4296569 100755 --- a/src/get.sh +++ b/src/get.sh @@ -117,6 +117,9 @@ download_packages () { mkdir -p "$out_dir" for package in $@; do + set -- $(get_package_download_info $package) + checksum=$2 + size=$3 outputs="$outputs ${out_dir}/${checksum}.${package}.xipkg" done fetch_serial $total_download $outputs @@ -255,3 +258,4 @@ fetch_parallel () { done wait_for_download total_download $@ & } + -- cgit v1.2.1