From 0f13f5912921321a7061ffde760ec41c32d99e77 Mon Sep 17 00:00:00 2001 From: Flole998 Date: Tue, 7 Jul 2020 17:51:03 +0200 Subject: [PATCH] Attempt to fix doozer build/python2/3 detection --- support/lib.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/support/lib.sh b/support/lib.sh index fc6b4d4b2..417f78dfa 100755 --- a/support/lib.sh +++ b/support/lib.sh @@ -99,11 +99,7 @@ function download N="${PCLOUD_BASEDIR}/staticlib/${CODENAME}/${ARCH}/${LIB_NAME}-${LIB_HASH}.tgz" echo "DOWNLOAD ${N} / ${PCLOUD_HASHDIR}" - if hash python; then - ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp" - else - python3 ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp" - fi + ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp" || python3 ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp" R=$? @@ -177,11 +173,7 @@ function upload # Upload N="${PCLOUD_BASEDIR}/staticlib/${CODENAME}/${ARCH}/${LIB_NAME}-${LIB_HASH}.tgz" echo "UPLOAD ${N}" - if hash python; then - ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1 - else - python3 ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1 - fi + ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || python3 ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1 # Done mv "${P}.tmp" "${P}" || return 1 -- 2.47.2