From: Flole998 Date: Mon, 18 May 2020 23:28:12 +0000 (+0200) Subject: Use python3 if available X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb57b2277cdcd0b25584997534dd018061f2ec5f;p=thirdparty%2Ftvheadend.git Use python3 if available --- diff --git a/support/lib.sh b/support/lib.sh index d20134f7d..77d3d471a 100755 --- a/support/lib.sh +++ b/support/lib.sh @@ -99,7 +99,11 @@ function download N="${PCLOUD_BASEDIR}/staticlib/${CODENAME}/${ARCH}/${LIB_NAME}-${LIB_HASH}.tgz" echo "DOWNLOAD ${N} / ${PCLOUD_HASHDIR}" - ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp" + if [[ "$(python3 -V)" =~ "Python 3" ]]; then + python3 ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp" + else + ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp" + fi R=$? @@ -173,8 +177,12 @@ function upload # Upload N="${PCLOUD_BASEDIR}/staticlib/${CODENAME}/${ARCH}/${LIB_NAME}-${LIB_HASH}.tgz" echo "UPLOAD ${N}" - ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1 - + if [[ "$(python3 -V)" =~ "Python 3" ]]; then + python3 ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1 + else + ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1 + fi + # Done mv "${P}.tmp" "${P}" || return 1 }