From 1133c08556d8e826c5343941e792850835569564 Mon Sep 17 00:00:00 2001
From: Stefaan Ghysels <stefaang@gmail.com>
Date: Thu, 3 Oct 2019 15:23:10 +0200
Subject: [PATCH 1/2] Bump docker to 19.03.2

---
 wdpk/docker/apkg.rc    |  2 +-
 wdpk/docker/install.sh | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/wdpk/docker/apkg.rc b/wdpk/docker/apkg.rc
index ffd2f72..0970af2 100644
--- a/wdpk/docker/apkg.rc
+++ b/wdpk/docker/apkg.rc
@@ -1,5 +1,5 @@
 Package:	docker
-Version:	18.09.1
+Version:	19.03.2
 Packager:	TFL
 Email:
 Homepage:	https://docker.com
diff --git a/wdpk/docker/install.sh b/wdpk/docker/install.sh
index febc3f8..f6c8f74 100755
--- a/wdpk/docker/install.sh
+++ b/wdpk/docker/install.sh
@@ -21,23 +21,19 @@ ARCH="$(uname -m)"
 
 # download docker binaries
 cd "${APKG_PATH}"
-TARBALL="docker-18.09.1.tgz"
+TARBALL="docker-19.03.2.tgz"
 
 if [ ${ARCH} != "x86_64" ]; then
     ARCH="armel"
     # JediNite provides custom docker packages for ARM
     # They are based on docker-runc without seccomp, as the kernel doesn't support it
-    # The latest version is not available yet
-    wget "https://github.com/JediNite/docker-ce-WDEX4100-binaries/raw/master/armv7l-WDEX4100/${TARBALL}" --no-check-certificate
+    URL="https://github.com/JediNite/docker-ce-WDEX4100-binaries/raw/master/armv7l-WDEX4100/${TARBALL}"
 else
-    wget "https://download.docker.com/linux/static/stable/${ARCH}/${TARBALL}" --no-check-certificate
+    URL="https://download.docker.com/linux/static/stable/${ARCH}/${TARBALL}"
 fi
 
-# extract the package
-tar xzf ${TARBALL} >> $log 2>&1
-
-# remove the package
-rm ${TARBALL}
+# download and extract the package
+curl -L "${URL}" | tar xz >> $log 2>&1
 
 # stop original docker v1.7
 if [ -e "${ORIG_DAEMONSH}" ]; then

From c60d75b8bc9e8934a7efdbb8d09d198a080dc34d Mon Sep 17 00:00:00 2001
From: Stefaan Ghysels <stefaang@gmail.com>
Date: Thu, 3 Oct 2019 15:23:40 +0200
Subject: [PATCH 2/2] Fix package installer

---
 build_and_install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build_and_install.sh b/build_and_install.sh
index aa6c7ea..d769314 100755
--- a/build_and_install.sh
+++ b/build_and_install.sh
@@ -42,8 +42,9 @@ MODEL="$3"
 if [ -z "$MODEL" ]; then
 	MODEL="PR4100"
 fi
+echo "Select model $MODEL"
 
-BINARY=$(find packages/$PACKAGE -name "*$MODEL_$PACKAGE_*.bin" | sort | tail -n1)
+BINARY=$(find packages/$PACKAGE -name "*${MODEL}_${PACKAGE}_*.bin" | sort | tail -n1)
 echo "Created $BINARY"
 
 TARGET="$2"
@@ -59,7 +60,7 @@ cssh=ssh
 
 echo
 echo "Install the app"
-$cssh $TARGET /bin/sh -c "/usr/sbin/upload_apkg -rapp.bin -d -f1 -g1 && echo OK!"
+$cssh $TARGET "PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin /usr/sbin/upload_apkg -rapp.bin -d -f1 -g1 && echo 'SUCCESS!'"
 
 
 TEST=tests/$PACKAGE/test.sh