From 23b7b87b77bad4d264016fea3889fcfe24e44f14 Mon Sep 17 00:00:00 2001
From: Andi <h4de5@users.noreply.github.com>
Date: Tue, 22 Dec 2020 04:03:14 +0100
Subject: [PATCH 1/5] Update installVolumio2

Use https to check for latest volumio version.
---
 Volumio2/installVolumio2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Volumio2/installVolumio2 b/Volumio2/installVolumio2
index c1418e4..aa883df 100644
--- a/Volumio2/installVolumio2
+++ b/Volumio2/installVolumio2
@@ -165,7 +165,7 @@ BB_MEM="240"         # this corresponds to Volumio default 16MB gpu memory split
 
 
 # Try to find latest Volumio2 version number
-VLATEST=$( curl -Ls --user-agent "fogent" "https://volumio.org/get-started/#pi" | grep -o 'http:\/\/updates.volumio.org\/pi\/volumio\/.*\/volumio' | awk -F "/" '{print $6}' )
+VLATEST=$( curl -Ls --user-agent "fogent" "https://volumio.org/get-started/#pi" | grep -o 'https:\/\/updates.volumio.org\/pi\/volumio\/.*\/volumio' | awk -F "/" '{print $6}' )
 echo ""
 if [ -z "${VLATEST}" ]; then
   echo "Could not identify latest version, falling-back to version ${FBVERSION}"

From 0a84cfa0d8e9d95f5c500ae0dcd06c90da603a7b Mon Sep 17 00:00:00 2001
From: Andi <h4de5@users.noreply.github.com>
Date: Tue, 22 Dec 2020 04:14:57 +0100
Subject: [PATCH 2/5] Update installVolumio2

---
 Volumio2/installVolumio2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Volumio2/installVolumio2 b/Volumio2/installVolumio2
index aa883df..7405377 100644
--- a/Volumio2/installVolumio2
+++ b/Volumio2/installVolumio2
@@ -204,7 +204,7 @@ FILENAME="${IMAGENAME}".img"${BB_MEM}"   # Volumio image file name in Berryboot
 touch "${FILENAME}"
 
 echo "Downloading original image from Volumio2 repo, this may take a bit of time..."
-if zsync -i "${FILENAME}" http://updates.volumio.org/pi/volumio/"${VLATEST}"/volumio_current.sqsh.zsync; then
+if zsync -i "${FILENAME}" https://updates.volumio.org/pi/volumio/"${VLATEST}"/volumio_current.sqsh.zsync; then
   echo "Obtaining patches..."
   if wget -O berryboot-init "${BBINITURL}" > /dev/null 2>&1; then
     echo "Applying patches..."

From 68c17c0ed7bbdffbd225fb33dd399c1e6a3052dd Mon Sep 17 00:00:00 2001
From: Andi <h4de5@users.noreply.github.com>
Date: Tue, 22 Dec 2020 04:25:42 +0100
Subject: [PATCH 3/5] Update installVolumio2

Split download of zsync files, because zsync does not support https
---
 Volumio2/installVolumio2 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Volumio2/installVolumio2 b/Volumio2/installVolumio2
index 7405377..a9d1f22 100644
--- a/Volumio2/installVolumio2
+++ b/Volumio2/installVolumio2
@@ -203,8 +203,11 @@ cd "${WORKDIR}"
 FILENAME="${IMAGENAME}".img"${BB_MEM}"   # Volumio image file name in Berryboot
 touch "${FILENAME}"
 
+echo "Downloading zsync file.."
+wget -O volumio_current.sqsh.zsync https://updates.volumio.org/pi/volumio/"${VLATEST}"/volumio_current.sqsh.zsync > /dev/null 2>&1
+
 echo "Downloading original image from Volumio2 repo, this may take a bit of time..."
-if zsync -i "${FILENAME}" https://updates.volumio.org/pi/volumio/"${VLATEST}"/volumio_current.sqsh.zsync; then
+if zsync -i "${FILENAME}" volumio_current.sqsh.zsync; then
   echo "Obtaining patches..."
   if wget -O berryboot-init "${BBINITURL}" > /dev/null 2>&1; then
     echo "Applying patches..."

From 269c319a047dfb2d0dd5047a2a05a03df2af785a Mon Sep 17 00:00:00 2001
From: Andi <h4de5@users.noreply.github.com>
Date: Tue, 22 Dec 2020 04:40:52 +0100
Subject: [PATCH 4/5] Update installVolumio2

Add url to zsync to fix possible relative urls
---
 Volumio2/installVolumio2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Volumio2/installVolumio2 b/Volumio2/installVolumio2
index a9d1f22..bb0a96f 100644
--- a/Volumio2/installVolumio2
+++ b/Volumio2/installVolumio2
@@ -207,7 +207,7 @@ echo "Downloading zsync file.."
 wget -O volumio_current.sqsh.zsync https://updates.volumio.org/pi/volumio/"${VLATEST}"/volumio_current.sqsh.zsync > /dev/null 2>&1
 
 echo "Downloading original image from Volumio2 repo, this may take a bit of time..."
-if zsync -i "${FILENAME}" volumio_current.sqsh.zsync; then
+if zsync -i "${FILENAME}" -u https://updates.volumio.org/pi/volumio/"${VLATEST}"/ volumio_current.sqsh.zsync; then
   echo "Obtaining patches..."
   if wget -O berryboot-init "${BBINITURL}" > /dev/null 2>&1; then
     echo "Applying patches..."

From 23e477322428f2b87dce85b94baceff35901abec Mon Sep 17 00:00:00 2001
From: Andi <h4de5@users.noreply.github.com>
Date: Tue, 22 Dec 2020 04:43:20 +0100
Subject: [PATCH 5/5] Update installVolumio2

---
 Volumio2/installVolumio2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Volumio2/installVolumio2 b/Volumio2/installVolumio2
index bb0a96f..4621f17 100644
--- a/Volumio2/installVolumio2
+++ b/Volumio2/installVolumio2
@@ -203,7 +203,7 @@ cd "${WORKDIR}"
 FILENAME="${IMAGENAME}".img"${BB_MEM}"   # Volumio image file name in Berryboot
 touch "${FILENAME}"
 
-echo "Downloading zsync file.."
+echo "Downloading zsync file..."
 wget -O volumio_current.sqsh.zsync https://updates.volumio.org/pi/volumio/"${VLATEST}"/volumio_current.sqsh.zsync > /dev/null 2>&1
 
 echo "Downloading original image from Volumio2 repo, this may take a bit of time..."