Merge pull request #558 from ashura82/patch-1

Update rtletsencrypt

scripts/rtinst

@@ -199,11 +199,11 @@ if [ $(dpkg-query -W -f='${Status}' lsb-release 2>/dev/null | grep -c "ok instal
 fi
 
 fullrel=$(lsb_release -sd)
-osname=$(lsb_release -si)
+osname=$(lsb_release -si); osname=${osname^}
 relno=$(lsb_release -sr | cut -d. -f1)
 
 # Fallback if lsb_release -si returns anything else than Ubuntu, Debian or Raspbian
-if [ ! "$osname" = "ubuntu" ] && [ ! "$osname" = "debian" ] && [ ! "$osname" = "raspbian" ]; then
+if [ ! "$osname" = "Ubuntu" ] && [ ! "$osname" = "Debian" ] && [ ! "$osname" = "Raspbian" ]; then
   osname=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
   osname=${osname^}
 fi

scripts/rtletsencrypt

@@ -62,19 +62,15 @@ if [ $(dpkg-query -W -f='${Status}' "certbot" 2>/dev/null | grep -c "ok installe
   aptitude -q=5 -y remove certbot python*-certbot-nginx >> $logfile 2>&1
 fi
 
-# Install Snapd service if not installed
-if [ $(dpkg-query -W -f='${Status}' "snapd" 2>/dev/null | grep -c "ok installed") = 0 ]; then
-    echo "Installing snapd service"
-    aptitude -q=5 -y install snapd >> $logfile 2>&1
-fi
-
+# Install Snapd service
+aptitude -q=5 -y install snapd >> $logfile 2>&1
 # Install the core snap in order to get the latest snapd for Debian
-if [ $osname = "Debian" ]; then snap install core >> $logfile 2>&1 && snap refresh core; fi
+if [ $osname = "Debian" ]; then snap install core >> $logfile 2>&1; snap refresh core; fi
 
 # Installing Certbot
 if [ $(snap list | grep -c "certbot") = 0 ]; then
   echo "Installing certbot"
-  snap -y install --classic certbot >> $logfile 2>&1
+  snap install --classic certbot >> $logfile 2>&1
 else
   echo "certbot already installed"
 fi
@@ -84,6 +80,8 @@ if [ $(snap list | grep -c "certbot") = 0 ]; then
   exit 1
 fi
 
+#Prepare certbot command
+ln -s /snap/bin/certbot /usr/bin/certbot
 
 #Generating Certificates
 certbot -q --nginx --register-unsafely-without-email --agree-tos certonly -d $serverdn >> $logfile 2>&1

scripts/rtupdate

@@ -218,16 +218,19 @@ echo "Fetching source files"
 
 if [ $xmlrpc_repo = 0 ]; then
   svn co $xmlrpcloc xmlrpc  >> $logfile 2>&1
+  if [ ! -e xmlrpc ]; then 
+    git clone $xmlrpc_url_alt xmlrpc >> $logfile 2>&1
+    cd xmlrpc/stable
+  else cd xmlrpc; fi
 
-  cd xmlrpc
   echo "Installing xmlrpc" | tee -a $logfile
   ./configure --prefix=/usr --disable-cplusplus >> $logfile 2>&1
   make -j$(nproc) >> $logfile 2>&1
   make -s install >> $logfile 2>&1
-  cd ..
+  cd $home/source
 fi
 
-cd libtorrent-$libvers
+cd libtorrent*
 echo "Installing libtorrent" | tee -a $logfile
 ./autogen.sh >> $logfile 2>&1
 if [ $osname = "Raspbian" ]; then
@@ -238,7 +241,7 @@ fi
 make -j$(nproc) >> $logfile 2>&1
 make -s install >> $logfile 2>&1
 
-cd ../rtorrent-$rtvers
+cd ../rtorrent*
 echo "Installing rtorrent" | tee -a $logfile
 ./autogen.sh >> $logfile 2>&1
 ./configure --prefix=/usr --with-xmlrpc-c --enable-ipv6 >> $logfile 2>&1
@@ -246,8 +249,6 @@ make -j$(nproc) >> $logfile 2>&1
 make -s install >> $logfile 2>&1
 ldconfig >> $logfile 2>&1
 
- echo "$libvers/$rtvers installed"
- echo
 
 if [ -d /var/www/rutorrent/conf/users ]; then
   cd /var/www/rutorrent/conf/users