From f6164ddd7efb9179894031e94cfd1f15303d58a1 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 3 Mar 2019 10:30:04 +0100 Subject: [PATCH] termux_download_deb: check that Packages exist before reading hash --- scripts/build/termux_download_deb.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/scripts/build/termux_download_deb.sh b/scripts/build/termux_download_deb.sh index 4a4293c92..5b4351b81 100755 --- a/scripts/build/termux_download_deb.sh +++ b/scripts/build/termux_download_deb.sh @@ -1,24 +1,27 @@ termux_download_deb() { - local package=$1 - local package_arch=$2 - local version=$3 - local deb_file=${package}_${version}_${package_arch}.deb + local PACKAGE=$1 + local PACKAGE_ARCH=$2 + local VERSION=$3 + local DEB_FILE=${PACKAGE}_${VERSION}_${PACKAGE_ARCH}.deb + PKG_HASH="" for idx in $(seq ${#TERMUX_REPO_URL[@]}); do local TERMUX_REPO_NAME=$(echo ${TERMUX_REPO_URL[$idx-1]} | sed -e 's%https://%%g' -e 's%http://%%g' -e 's%/%-%g') local PACKAGE_FILE_PATH="${TERMUX_REPO_NAME}-${TERMUX_REPO_DISTRIBUTION[$idx-1]}-${TERMUX_REPO_COMPONENT[$idx-1]}-Packages" - read -d "\n" PKG_PATH PKG_HASH <<<$(./scripts/get_hash_from_file.py "${TERMUX_COMMON_CACHEDIR}-$arch/$PACKAGE_FILE_PATH" $package $version) - if ! [ "$PKG_HASH" = "" ]; then - if [ ! "$TERMUX_QUIET_BUILD" = true ]; then - echo "Found $package in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}" + if [ -f "${TERMUX_COMMON_CACHEDIR}-${PACKAGE_ARCH}/${PACKAGE_FILE_PATH}" ]; then + read -d "\n" PKG_PATH PKG_HASH <<<$(./scripts/get_hash_from_file.py "${TERMUX_COMMON_CACHEDIR}-${PACKAGE_ARCH}/$PACKAGE_FILE_PATH" $PACKAGE $VERSION) + if [ ! -z "$PKG_HASH" ]; then + if [ ! "$TERMUX_QUIET_BUILD" = true ]; then + echo "Found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}" + fi + break fi - break fi done if [ "$PKG_HASH" = "" ]; then return 1 else termux_download ${TERMUX_REPO_URL[$idx-1]}/${PKG_PATH} \ - $TERMUX_COMMON_CACHEDIR-$package_arch/${deb_file} \ + $TERMUX_COMMON_CACHEDIR-$PACKAGE_ARCH/${DEB_FILE} \ $PKG_HASH return 0 fi