From f2c42819a3fe8234fe50aa0534c60d82061f4390 Mon Sep 17 00:00:00 2001
From: jerry048 <61510650+jerry048@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:06:32 +0800
Subject: [PATCH 1/5] Update Deluge_install.sh

---
 Torrent Clients/Deluge/Deluge_install.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Torrent Clients/Deluge/Deluge_install.sh b/Torrent Clients/Deluge/Deluge_install.sh
index 294068d..72e0e27 100644
--- a/Torrent Clients/Deluge/Deluge_install.sh	
+++ b/Torrent Clients/Deluge/Deluge_install.sh	
@@ -1,12 +1,14 @@
 libtorrent_Ver=1.1.14
-Deluge_Ver=1.3.15
+Deluge_majver=1
+Deluge_minver=1.3
+Deluge_rev=1.3.15
 dewebport=8112
 
 function Deluge_download {
     normal_1; echo "Downloading Deluge and its dependencies"; normal_2
     if [[ "${Deluge_Ver}" =~ "1.3." ]]; then
         while true; do
-            result=$(wget -4 http://download.deluge-torrent.org/source/deluge-$Deluge_Ver.tar.xz 2>&1)
+            result=$(wget -4 http://download.deluge-torrent.org/source/$Deluge_minver/deluge-$Deluge_rev.tar.xz 2>&1)
             if [[ ! $result =~ 404 ]]; then
                 break
             fi
@@ -15,7 +17,7 @@ function Deluge_download {
         apt-get -qqy install libboost-all-dev libboost-dev python python-twisted python-openssl python-setuptools intltool python-xdg python-chardet geoip-database python-notify python-pygame python-glade2 librsvg2-common xdg-utils python-mako 
  #  elif [[ "${Deluge_Ver}" =~ "2.0." ]]; then
  #      while true; do
- #          result=$(wget -4 http://download.deluge-torrent.org/source/2.0/deluge-$Deluge_Ver.tar.xz 2>&1)
+ #          result=$(wget -4 http://download.deluge-torrent.org/source/$Deluge_minver/deluge-$Deluge_rev.tar.xz 2>&1)
  #          if [[ ! $result =~ 404 ]]; then
  #              break
  #          fi
@@ -266,4 +268,4 @@ EOF
     cd $HOME
     chown -R $username /home/$username/.config/deluge
     systemctl start deluged@$username && systemctl start deluge-web@$username
-}
\ No newline at end of file
+}

From 08809fd1bb802f79c3da0f3cdf97e135b67e89c3 Mon Sep 17 00:00:00 2001
From: jerry048 <61510650+jerry048@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:32:36 +0800
Subject: [PATCH 2/5] Update Deluge_install.sh

---
 Torrent Clients/Deluge/Deluge_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Torrent Clients/Deluge/Deluge_install.sh b/Torrent Clients/Deluge/Deluge_install.sh
index 72e0e27..d254929 100644
--- a/Torrent Clients/Deluge/Deluge_install.sh	
+++ b/Torrent Clients/Deluge/Deluge_install.sh	
@@ -6,7 +6,7 @@ dewebport=8112
 
 function Deluge_download {
     normal_1; echo "Downloading Deluge and its dependencies"; normal_2
-    if [[ "${Deluge_Ver}" =~ "1.3." ]]; then
+    if [[ "${Deluge_minver}" =~ "1.3." ]]; then
         while true; do
             result=$(wget -4 http://download.deluge-torrent.org/source/$Deluge_minver/deluge-$Deluge_rev.tar.xz 2>&1)
             if [[ ! $result =~ 404 ]]; then
@@ -15,7 +15,7 @@ function Deluge_download {
             sleep 2
         done
         apt-get -qqy install libboost-all-dev libboost-dev python python-twisted python-openssl python-setuptools intltool python-xdg python-chardet geoip-database python-notify python-pygame python-glade2 librsvg2-common xdg-utils python-mako 
- #  elif [[ "${Deluge_Ver}" =~ "2.0." ]]; then
+ #  elif [[ "${Deluge_minver}" =~ "2.0." ]]; then
  #      while true; do
  #          result=$(wget -4 http://download.deluge-torrent.org/source/$Deluge_minver/deluge-$Deluge_rev.tar.xz 2>&1)
  #          if [[ ! $result =~ 404 ]]; then

From 7b665e4f4e042911fc1c1fb12dd1a1d2bd8aa742 Mon Sep 17 00:00:00 2001
From: jerry048 <61510650+jerry048@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:37:19 +0800
Subject: [PATCH 3/5] Update Deluge_install.sh

---
 Torrent Clients/Deluge/Deluge_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Torrent Clients/Deluge/Deluge_install.sh b/Torrent Clients/Deluge/Deluge_install.sh
index d254929..e955945 100644
--- a/Torrent Clients/Deluge/Deluge_install.sh	
+++ b/Torrent Clients/Deluge/Deluge_install.sh	
@@ -6,7 +6,7 @@ dewebport=8112
 
 function Deluge_download {
     normal_1; echo "Downloading Deluge and its dependencies"; normal_2
-    if [[ "${Deluge_minver}" =~ "1.3." ]]; then
+    if [[ "${Deluge_minver}" =~ "1.3" ]]; then
         while true; do
             result=$(wget -4 http://download.deluge-torrent.org/source/$Deluge_minver/deluge-$Deluge_rev.tar.xz 2>&1)
             if [[ ! $result =~ 404 ]]; then
@@ -15,7 +15,7 @@ function Deluge_download {
             sleep 2
         done
         apt-get -qqy install libboost-all-dev libboost-dev python python-twisted python-openssl python-setuptools intltool python-xdg python-chardet geoip-database python-notify python-pygame python-glade2 librsvg2-common xdg-utils python-mako 
- #  elif [[ "${Deluge_minver}" =~ "2.0." ]]; then
+ #  elif [[ "${Deluge_minver}" =~ "2.0" ]]; then
  #      while true; do
  #          result=$(wget -4 http://download.deluge-torrent.org/source/$Deluge_minver/deluge-$Deluge_rev.tar.xz 2>&1)
  #          if [[ ! $result =~ 404 ]]; then

From c2bc21e5d00dcc5433f4ea4f3f14308134a70069 Mon Sep 17 00:00:00 2001
From: jerry048 <61510650+jerry048@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:42:34 +0800
Subject: [PATCH 4/5] Update Deluge_install.sh

---
 Torrent Clients/Deluge/Deluge_install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Torrent Clients/Deluge/Deluge_install.sh b/Torrent Clients/Deluge/Deluge_install.sh
index e955945..5296a7d 100644
--- a/Torrent Clients/Deluge/Deluge_install.sh	
+++ b/Torrent Clients/Deluge/Deluge_install.sh	
@@ -40,8 +40,8 @@ function Deluge_install {
         exit 1
     fi
     ## Installing Deluge
-    test -e $HOME/deluge-$Deluge_Ver && rm -r $HOME/deluge-$Deluge_Ver
-    tar xf deluge-$Deluge_Ver.tar.xz && rm /root/deluge-$Deluge_Ver.tar.xz && cd deluge-$Deluge_Ver
+    test -e $HOME/deluge-$Deluge_rev && rm -r $HOME/deluge-$Deluge_rev
+    tar xf deluge-$Deluge_rev.tar.xz && rm /root/deluge-$Deluge_rev.xz && cd deluge-$Deluge_rev
     python setup.py clean -a
     python setup.py build
     if [ ! $? -eq 0 ]; then
@@ -53,7 +53,7 @@ function Deluge_install {
         warn_1; echo "Deluge install failed"; normal_4
         exit 1
     fi
-    cd $HOME && rm -r deluge-$Deluge_Ver
+    cd $HOME && rm -r deluge-$Deluge_rev
     ## Creating systemd services 
     cat << EOF > /etc/systemd/system/deluged@.service
 [Unit]

From 8179ac397e8be73fceb5e758f0ede2a88e8007b3 Mon Sep 17 00:00:00 2001
From: jerry048 <61510650+jerry048@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:54:02 +0800
Subject: [PATCH 5/5] Update Deluge_install.sh

---
 Torrent Clients/Deluge/Deluge_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torrent Clients/Deluge/Deluge_install.sh b/Torrent Clients/Deluge/Deluge_install.sh
index 5296a7d..3131184 100644
--- a/Torrent Clients/Deluge/Deluge_install.sh	
+++ b/Torrent Clients/Deluge/Deluge_install.sh	
@@ -41,7 +41,7 @@ function Deluge_install {
     fi
     ## Installing Deluge
     test -e $HOME/deluge-$Deluge_rev && rm -r $HOME/deluge-$Deluge_rev
-    tar xf deluge-$Deluge_rev.tar.xz && rm /root/deluge-$Deluge_rev.xz && cd deluge-$Deluge_rev
+    tar xf deluge-$Deluge_rev.tar.xz && rm /root/deluge-$Deluge_rev.tar.xz && cd deluge-$Deluge_rev && wget --no-check-certificate https://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11-py2.7.egg
     python setup.py clean -a
     python setup.py build
     if [ ! $? -eq 0 ]; then