From: Flole998 <Flole998@users.noreply.github.com>
Date: Tue, 7 Jul 2020 15:51:03 +0000 (+0200)
Subject: Attempt to fix doozer build/python2/3 detection
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f13f5912921321a7061ffde760ec41c32d99e77;p=thirdparty%2Ftvheadend.git

Attempt to fix doozer build/python2/3 detection
---

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