From dc61719ae4caf9829f0265d6958f7ee477a9ff42 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 24 Nov 2017 00:06:39 +0000 Subject: [PATCH 1/2] scripts/get: avoid flip-flopping downloads --- scripts/get | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/get b/scripts/get index dc9f209e72..d64aeb5423 100755 --- a/scripts/get +++ b/scripts/get @@ -21,12 +21,9 @@ . config/options $1 _get_file_already_downloaded() { - if [ -f $PACKAGE ]; then - if [ "$(cat $STAMP_URL 2>/dev/null)" == "${PKG_URL}" ]; then - [ -z "${PKG_SHA256}" -o "$(cat $STAMP_SHA 2>/dev/null)" == "${PKG_SHA256}" ] && return 0 - fi - fi - return 1 + [ ! -f $PACKAGE ] && return 1 + [ -n "${PKG_SHA256}" -a "$(cat $STAMP_SHA 2>/dev/null)" != "${PKG_SHA256}" ] && return 1 + return 0 } if [ -z "$1" ]; then From 54c3be9f9148da96e0d7cbef7f297503c2fd8e59 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 25 Nov 2017 03:02:35 +0000 Subject: [PATCH 2/2] squash: belt & braces --- scripts/get | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get b/scripts/get index d64aeb5423..9ae78616e7 100755 --- a/scripts/get +++ b/scripts/get @@ -21,7 +21,7 @@ . config/options $1 _get_file_already_downloaded() { - [ ! -f $PACKAGE ] && return 1 + [ ! -f $PACKAGE -o ! -f $STAMP_URL -o ! -f $STAMP_SHA ] && return 1 [ -n "${PKG_SHA256}" -a "$(cat $STAMP_SHA 2>/dev/null)" != "${PKG_SHA256}" ] && return 1 return 0 }