Attempt to fix doozer builds (#1340)

* Update lib.sh

* Install python3 requirements

diff --git a/.doozer.json b/.doozer.json
index 9498a6834d9268bcd59d5bdae972f4fc845f2342..6d495b4400197629b275065bf10bf40737726f59 100644 (file)
--- a/.doozer.json
+++ b/.doozer.json
@@ -234,10 +234,12 @@
         "libpcre2-dev",
         "libdvbcsa-dev",
         "python3",
+        "python3-pip",
         "debhelper",
         "ccache"
       ],
       "buildcmd": [
+        "pip3 install requests",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt",
       ]
@@ -260,10 +262,12 @@
         "libpcre2-dev",
         "libdvbcsa-dev",
         "python3",
+        "python3-pip",
         "debhelper",
         "ccache"
       ],
       "buildcmd": [
+        "pip3 install requests",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt",
       ]

diff --git a/support/lib.sh b/support/lib.sh
index 77d3d471accf63a8aa324a8fd037a7b9ffaf2b90..3cb14276d636ab228e4dfaf22a366758a589a092 100755 (executable)
--- a/support/lib.sh
+++ b/support/lib.sh
@@ -99,10 +99,10 @@ function download
   N="${PCLOUD_BASEDIR}/staticlib/${CODENAME}/${ARCH}/${LIB_NAME}-${LIB_HASH}.tgz"
 
   echo "DOWNLOAD        ${N} / ${PCLOUD_HASHDIR}"
-  if [[ "$(python3 -V)" =~ "Python 3" ]]; then
-    python3 ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp"
-  else
+  if [[ "$(python -V)" =~ "Python 2" ]]; 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
 
   R=$?
@@ -177,10 +177,10 @@ function upload
   # Upload
   N="${PCLOUD_BASEDIR}/staticlib/${CODENAME}/${ARCH}/${LIB_NAME}-${LIB_HASH}.tgz"
   echo "UPLOAD          ${N}"
-  if [[ "$(python3 -V)" =~ "Python 3" ]]; then
-    python3 ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1
-  else
+  if [[ "$(python -V)" =~ "Python 2" ]]; then
     ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1
+  else
+    python3 ${ROOTDIR}/support/pcloud.py upload "${N}" "${P}.tmp" || return 1
   fi
   
   # Done