]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Attempt to fix doozer build/python2/3 detection
authorFlole998 <Flole998@users.noreply.github.com>
Tue, 7 Jul 2020 15:51:03 +0000 (17:51 +0200)
committerGitHub <noreply@github.com>
Tue, 7 Jul 2020 15:51:03 +0000 (17:51 +0200)
support/lib.sh

index fc6b4d4b209abc9070e21a693c4344d25f9a4a5a..417f78dfad6a0fe2c396cfe423b8e2f448a970ca 100755 (executable)
@@ -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