From 17fc9c0c3948c7bf62ea7240fff8b14b1dd50464 Mon Sep 17 00:00:00 2001
From: Blake <7227893+nintendo424@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:32:19 -0500
Subject: [PATCH] Move from subversion to git for pulling the qbittorrent webui
 (#530)

* Move from subversion to git for pulling the qbittorrent webui

* slight verbage changes
---
 docker-mods/qbittorrent/Dockerfile            |  2 +-
 .../root/etc/cont-init.d/98-themepark         | 22 +++++++++----------
 .../init-mod-themepark-add-package/run        |  4 ++--
 .../s6-overlay/s6-rc.d/init-mod-themepark/run | 14 ++++++------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docker-mods/qbittorrent/Dockerfile b/docker-mods/qbittorrent/Dockerfile
index 4c3ca04c..d12803c2 100644
--- a/docker-mods/qbittorrent/Dockerfile
+++ b/docker-mods/qbittorrent/Dockerfile
@@ -1,7 +1,7 @@
 FROM scratch
 
-
 LABEL maintainer="GilbN" 
 LABEL app="Qbittorrent"
+
 #copy local files.
 COPY root/ /
\ No newline at end of file
diff --git a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
index b02e895e..783c94fb 100755
--- a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
@@ -23,17 +23,17 @@ if [ "${TP_DISABLE_THEME}" = true ]; then
   exit 0
 fi
 
-if ! [[ -x "$(command -v svn)" ]]; then
+if ! [[ -x "$(command -v git)" ]]; then
 echo '--------------------------'
-echo '| Installing svn package |'
+echo '| Installing git package |'
 echo '--------------------------'
     if [ -x "$(command -v apk)" ]; then 
       apk update && \
-      apk add --no-cache subversion
+      apk add --no-cache git
       apk add --no-cache perl
     elif [ -x "$(command -v apt-get)" ]; then
       apt-get update && \
-      apt-get install -y subversion
+      apt-get install -y git
       apt-get install -y perl
     fi
 fi
@@ -80,15 +80,15 @@ if [[ ! -d /themepark ]]; then
     echo '---------------------------------------'
     echo '| Downloading WebUI files from github |'
     echo '---------------------------------------'
-    printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n'
-    svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark
+    printf '\nDownloading qBittorrent to /temp\n'
+    git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp
     printf '\nDownload finished\n\n'
-    printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n'
-    svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp
-    cp -a /temp/. /themepark/public/icons
-    cp -a /temp/. /themepark/private/icons
+    cp -a /temp/src/webui/www /themepark
+    cp -a /temp/src/icons/. /themepark/public/icons
+    cp -a /temp/src/icons/. /themepark/private/icons
+    printf '\nCopy finished\n\n'
     rm -rf /temp
-    printf '\nDownload finished\n\n'
+    printf '\nCleanup finished\n\n'
 fi
 
 sed_file(){
diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
index 441dcab9..605a4f23 100755
--- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
+++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash 
 
-if ! [[ -x "$(command -v svn)" ]]; then
-    echo "subversion" >> /mod-repo-packages-to-install.list
+if ! [[ -x "$(command -v git)" ]]; then
+    echo "git" >> /mod-repo-packages-to-install.list
     echo "perl" >> /mod-repo-packages-to-install.list
 fi
diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
index 6935bc69..634b19ab 100755
--- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
+++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
@@ -65,15 +65,15 @@ if [[ ! -d /themepark ]]; then
     echo '---------------------------------------'
     echo '| Downloading WebUI files from github |'
     echo '---------------------------------------'
-    printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n'
-    svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark
+    printf '\nDownloading qBittorrent to /temp\n'
+    git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp
     printf '\nDownload finished\n\n'
-    printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n'
-    svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp
-    cp -a /temp/. /themepark/public/icons
-    cp -a /temp/. /themepark/private/icons
+    cp -a /temp/src/webui/www /themepark
+    cp -a /temp/src/icons/. /themepark/public/icons
+    cp -a /temp/src/icons/. /themepark/private/icons
+    printf '\nCopy finished\n\n'
     rm -rf /temp
-    printf '\nDownload finished\n\n'
+    printf '\nCleanup finished\n\n'
 fi
 
 sed_file(){