From 4b7d9dc86800fa7b861f47ae0e6e3a8f097f9ce7 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 21 Feb 2019 16:27:09 +0100 Subject: [PATCH] fetch-kde-qt.sh: get hashes from metadata --- maintainers/scripts/fetch-kde-qt.sh | 9 +++++---- pkgs/applications/kde/fetch.sh | 2 +- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/development/libraries/kde-frameworks/fetch.sh | 2 +- pkgs/development/libraries/qt-5/5.11/fetch.sh | 3 +-- pkgs/development/libraries/qt-5/5.12/fetch.sh | 3 +-- pkgs/development/libraries/qt-5/5.6/fetch.sh | 3 +-- pkgs/development/libraries/qt-5/5.9/fetch.sh | 3 +-- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index 1357f87aaa5d..a267a5fa8715 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -14,12 +14,13 @@ fi tmp=$(mktemp -d) pushd $tmp >/dev/null -wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null +wget -nH -r -c --no-parent "${WGET_ARGS[@]}" -A '*.tar.xz.sha256' -A '*.mirrorlist' >/dev/null +find -type f -name '*.mirrorlist' -delete csv=$(mktemp) find . -type f | while read src; do # Sanitize file name - filename=$(basename "$src" | tr '@' '_') + filename=$(gawk '{ print $2 }' "$src" | tr '@' '_') nameVersion="${filename%.tar.*}" name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,') version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') @@ -38,8 +39,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do latestVersion=$(echo "$versions" | sort -rV | head -n 1) src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv) filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv) - url="${src:2}" - sha256=$(nix-hash --type sha256 --base32 --flat "$src") + url="$(dirname "${src:2}")/$filename" + sha256=$(gawk '{ print $1 }' "$src") cat >>"$SRCS" <