Merge pull request #558 from ashura82/patch-1

Update rtletsencrypt

README.md

@@ -1,15 +1,14 @@
 ## rtinst
 
-### NOTE: THIS IS RELEASE DEB7UBU12 - Installs rtinst on OS's Ubu12, Ubu13, and Deb7 which are no longer supported in the main rtinst releases
+### Note: Now installs Lets Encrypt SSL certificates
 
 #### 30 Second Guide
 
 Ubuntu and Debian Seedbox Installation
 
-Download and run setup (if logged in as root, do not need to use sudo)
+Download and run setup (if logged in directly as root, do not need to use sudo)
 
-	wget --no-check-certificate https://raw.githubusercontent.com/arakasi72/rtinst/master/rtsetup
-	sudo bash rtsetup deb7ubu12
+	sudo bash -c "$(wget --no-check-certificate -qO - https://raw.githubusercontent.com/arakasi72/rtinst/master/rtsetup)"
 
 and then to run the main script, ([check the options you can use](https://github.com/arakasi72/rtinst/wiki/Guide#21-main-script-options)):
 
@@ -17,22 +16,22 @@ and then to run the main script, ([check the options you can use](https://github
 
 It takes about 10 minutes to run, depending on your server setup. After you have run the script and everything is working, I suggest a reboot, the script does not automate this reboot, you need to do it manually using the reboot command.
 
-[A detailed installation guide](https://github.com/arakasi72/rtinst/wiki/Guide)
+[A detailed installation guide](https://github.com/arakasi72/rtinst/wiki/Installing-rtinst)
+
+[A detailed user guide](https://github.com/arakasi72/rtinst/wiki/Guide)
 
 **IMPORTANT: NOTE THE NEW SSH PORT AND MAKE SURE YOU CAN SSH INTO YOUR SERVER BEFORE CLOSING THE EXISTING SESSION**
 
 
-It has been tested with clean installs of: 
+Current release has been tested with clean installs of: 
 
-	Ubuntu 12 (unsupported)
-	Ubuntu 13 (unsupported)
-	Ubuntu 14
-	Ubuntu 15
 	Ubuntu 16
 	Ubuntu 17
-	Debian 7 "Wheezy" (unsupported)
-	Debian 8 "Jessie"
+	Ubuntu 18
+	Ubuntu 19
+	Ubuntu 20
 	Debian 9 "Stretch"
+	Debian 10 "Buster"
 
 Services that will be installed and configured are
 
@@ -44,9 +43,18 @@ Services that will be installed and configured are
 	6. webmin (optional see section 3.7 in main guide)
 
 
-[A detailed installation guide, and additional information on all the features](https://github.com/arakasi72/rtinst/wiki/Guide)
+[rtinst installation guide](https://github.com/arakasi72/rtinst/wiki/Installing-rtinst)
 
-For older unssuported OS listed above see the [Older OS Installation Guide](https://github.com/arakasi72/rtinst/wiki/Installing-on-Older-OS)
+[Additional information on all the features](https://github.com/arakasi72/rtinst/wiki/Guide)
+
+For older unssuported OS [Older OS Installation Guide](https://github.com/arakasi72/rtinst/wiki/Installing-on-Older-OS). These include:
+	
+	Ubuntu 12 (old release)
+	Ubuntu 13 (old release)
+	Ubuntu 14 (old release)
+	Ubuntu 15 (old release)
+	Debian 7 "Wheezy" (old release)
+	Debian 8 "Jessie" (old release)
 
 To see latest updates to the script go to [Change Log](https://github.com/arakasi72/rtinst/wiki/Change-Log)
 

conf/nginxsite

@@ -1,5 +1,7 @@
 server {
         listen 80;
+        listen [::]:80;
+        #server_name <Domain Name>;
         root /var/www;
         
         index index.html index.php index.htm;
@@ -34,7 +36,10 @@ server {
 }
 
 server {
-        listen 443 ssl;
+        listen 443 ssl http2 default_server;
+        listen [::]:443 ssl http2 default_server;
+
+        #server_name <Domain Name>;
 
         root /var/www;
         index index.html index.php index.htm;

conf/rtorrent.rc

@@ -8,13 +8,15 @@ method.insert = cfg.basedir,     private|const|string, (cat,"<user home>/rtorren
 method.insert = cfg.watch,       private|const|string, (cat,(cfg.basedir),"watch/")
 
 #method.insert = cfg.logs,       private|const|string, (cat,(cfg.basedir),"log/")
-#method.insert = cfg.logfile,    private|const|string, (cat,(c   fg.logs),"rtorrent-",(system.time),".log")
+#method.insert = cfg.logfile,    private|const|string, (cat,(cfg.logs),"rtorrent-",(system.time),".log")
 
 session.path.set = (cat,(cfg.basedir),".session")
 directory.default.set = (cat,(cfg.basedir),"download")
 
 schedule = watch_directory,5,5,((load.start,(cat,(cfg.watch),"*.torrent")))
 
+#system.umask.set = 0000
+
 ### BitTorrent
 # Global upload and download rate in KiB, `0` for unlimited
 throttle.global_down.max_rate.set = 0

conf/ru.config

@@ -43,6 +43,7 @@ $pathToExternals = array(
 "gzip" => '/bin/gzip', // Something like /usr/bin/gzip. If empty, will be found in PATH.
 "id" => '/usr/bin/id', // Something like /usr/bin/id. If empty, will be found in PATH.
 "stat" => '/usr/bin/stat', // Something like /usr/bin/stat. If empty, will be found in PATH.
+"pgrep" => '/usr/bin/pgrep', // Something like /usr/bin/pgrep. If empty, will be found in PATH.
 );
 
 $localhosts = array( // list of local interfaces

conf/ru.ini

@@ -100,6 +100,8 @@ enabled = yes
 enabled = yes
 
 ;; Disabled
+[_cloudflare]
+enabled = no
 [check_port]
 enabled = no
 [chunks]
@@ -120,5 +122,7 @@ enabled = no
 enabled = no
 [scheduler]
 enabled = no
+[spectrogram]
+enabled = no
 [xmpp]
 enabled = no

conf/sources1204

@@ -1,56 +0,0 @@
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-deb http://de.archive.ubuntu.com/ubuntu/ precise main restricted
-deb-src http://de.archive.ubuntu.com/ubuntu/ precise main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb http://de.archive.ubuntu.com/ubuntu/ precise-updates main restricted
-deb-src http://de.archive.ubuntu.com/ubuntu/ precise-updates main restricted
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-deb http://de.archive.ubuntu.com/ubuntu/ precise universe
-deb-src http://de.archive.ubuntu.com/ubuntu/ precise universe
-deb http://de.archive.ubuntu.com/ubuntu/ precise-updates universe
-deb-src http://de.archive.ubuntu.com/ubuntu/ precise-updates universe
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team, and may not be under a free licence. Please satisfy yourself as to
-## your rights to use the software. Also, please note that software in
-## multiverse WILL NOT receive any review or updates from the Ubuntu
-## security team.
-deb http://de.archive.ubuntu.com/ubuntu/ precise multiverse
-deb-src http://de.archive.ubuntu.com/ubuntu/ precise multiverse
-deb http://de.archive.ubuntu.com/ubuntu/ precise-updates multiverse
-deb-src http://de.archive.ubuntu.com/ubuntu/ precise-updates multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-deb http://de.archive.ubuntu.com/ubuntu/ precise-backports main restricted universe multiverse
-deb-src http://de.archive.ubuntu.com/ubuntu/ precise-backports main restricted universe multiverse
-
-deb http://security.ubuntu.com/ubuntu precise-security main restricted
-deb-src http://security.ubuntu.com/ubuntu precise-security main restricted
-deb http://security.ubuntu.com/ubuntu precise-security universe
-deb-src http://security.ubuntu.com/ubuntu precise-security universe
-deb http://security.ubuntu.com/ubuntu precise-security multiverse
-deb-src http://security.ubuntu.com/ubuntu precise-security multiverse
-
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu precise partner
-# deb-src http://archive.canonical.com/ubuntu precise partner
-
-## Uncomment the following two lines to add software from Ubuntu's
-## 'extras' repository.
-## This software is not part of Ubuntu, but is offered by third-party
-## developers who want to ship their latest software.
-# deb http://extras.ubuntu.com/ubuntu precise main
-# deb-src http://extras.ubuntu.com/ubuntu precise main

rtsetup

@@ -13,11 +13,33 @@ PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/bin:/sbin
 rundir=$(dirname $(readlink -f $0))
 branch=$1
 
+# function to ask user for y/n response
+ask_user(){
+local answer
+while true
+  do
+    read answer
+    case $answer in [Yy]* ) return 0 ;;
+                    [Nn]* ) return 1 ;;
+                        * ) echo "Enter y or n";;
+    esac
+  done
+}
+
 if [ "$(id -u)" != "0" ]; then
   echo "Must be run as root, directly or with sudo"
   exit 1
 fi
 
+# kill apt-daily.service if running 
+if [[ $(systemctl list-units --all apt-daily.service | fgrep -c apt-daily.service) -gt 0 ]]; then
+  systemctl stop apt-daily.service > /dev/null 2>&1
+  systemctl kill --kill-who=all apt-daily.service > /dev/null 2>&1
+  sleep 5
+fi
+
+apt-get -qq update
+
 if [ $(dpkg-query -W -f='${Status}' git 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
 echo "Installing git"
 apt-get -yqq install git 2>&1 >> /dev/null
@@ -34,6 +56,19 @@ if [ -d /etc/rtinst ] && [ -z $branch ]; then
   branch=$(basename "$(git symbolic-ref -q HEAD)")
   if [ -z $branch ]; then
     branch=$(git describe --tags --exact-match)
+    if [ ${branch:0:1} = v ]; then
+      latest=$(curl -s "https://api.github.com/repos/arakasi72/rtinst/releases/latest" | awk -F '"' '/tag_name/{print $4}')
+      if [ $branch != $latest ]; then
+        echo "Updating from $branch to $latest"
+        branch=$latest
+      else
+        echo "Already using the latest version, rtinst $branch"
+        echo -n "Do you wish to reinstall rtinst y/n? "
+        if ! ask_user; then
+          exit
+        fi
+      fi
+    fi
   fi
   if [ $(git ls-remote --tags --heads https://github.com/arakasi72/rtinst.git $branch | wc -l) -eq 0 ]; then
     echo "$branch has been deleted, using latest numbered release instead"
@@ -54,15 +89,20 @@ if [ $(git ls-remote --tags --heads https://github.com/arakasi72/rtinst.git $bra
   exit
 fi
 
+echo "Installing rtinst $branch"
 cd
 rm -fr /etc/rtinst
 git clone -q https://github.com/arakasi72/rtinst.git /etc/rtinst
 cd /etc/rtinst
-git checkout $branch
+git checkout $branch > /dev/null 2>&1
 cd
 ln -sf /etc/rtinst/scripts/* /usr/local/bin
 ln -sf /etc/rtinst/rtsetup /usr/local/bin
 
+echo "Installation complete"
+echo
+echo "You can now run rtinst and the additional supporting scripts"
+
 if [ "$rundir" != "/etc/rtinst" ]; then
     rm -f $rundir/rtsetup
 fi

scripts/rtadduser

@@ -22,8 +22,9 @@ sshport=$(grep 'Port ' /etc/ssh/sshd_config | sed 's/[^0-9]*//g')
 ftpport=$(grep 'listen_port=' /etc/vsftpd.conf | sed 's/[^0-9]*//g')
 cronline1="@reboot sleep 10; /usr/local/bin/rtcheck irssi rtorrent"
 cronline2="*/10 * * * * /usr/local/bin/rtcheck irssi rtorrent"
-serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
+serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
 check_ssh=1
+rtdstatus=$(rtdload)
 
 #get user list
 cd /var/www/rutorrent/conf/users
@@ -33,6 +34,28 @@ user_list=*
 ### FUNCTIONS ###
 ###############################
 
+#function to determin if unix user name is valid
+valid_name(){
+    until [[ $user =~ ^[a-z][-a-z0-9_]{2,31}$ ]]
+      do
+        echo "Enter user name (lowercase, numbers, dash and underscore):"
+        read user
+      done
+}
+
+# function to ask user for y/n response
+ask_user(){
+local answer
+while true
+  do
+    read answer
+    case $answer in [Yy]* ) return 0 ;;
+                    [Nn]* ) return 1 ;;
+                        * ) echo "Enter y or n";;
+    esac
+  done
+}
+
 genpasswd() {
 local genln=$1
 [ -z "$genln" ] && genln=8
@@ -183,34 +206,39 @@ fi
 ###############################
 
 if [ -z "$user" ]; then
-  echo "Enter the name of the user to add"
+  echo "Enter the name of the user"
   echo "It can be an existing user or a new user"
   echo
-
   confirm_name=1
   while [ $confirm_name = 1 ]
     do
-      read -p "Enter user name: " answer
-      addname=$answer
-      check_name=1
-      if [ "$addname" = "root" ]; then
-        echo "Cannot create root"
-        exit
+      valid_name
+      echo -n "Confirm that user name is $user y/n? "
+      if ask_user; then
+        confirm_name=0
+      else
+        user=''
       fi
-
-      while [ $check_name = 1 ]
-        do
-          read -p "Is $addname correct? " answer
-          case $answer in [Yy]* ) confirm_name=0 && check_name=0  ;;
-                          [Nn]* ) confirm_name=1 && check_name=0  ;;
-                              * ) echo "Enter y or n";;
-          esac
-        done
     done
-
-  user=$addname
+else
+  if ! [[ $user =~ ^[a-z][-a-z0-9_]{2,31}$ ]]; then
+    echo "$user is not a valid user name please enter again"
+    confirm_name=1
+    while [ $confirm_name = 1 ]
+      do
+        valid_name
+        echo -n "Confirm that user name is $user y/n? "
+        if ask_user; then
+          confirm_name=0
+        else
+          user=''
+        fi
+      done
+  fi
 fi
 
+echo "User name is $user"
+
 if id -u $user >/dev/null 2>&1; then
   echo "$user already exists"
 else
@@ -220,6 +248,13 @@ else
     adduser --gecos "" $user --disabled-password
     echo "$user:$unixpass" | sudo chpasswd
   fi
+
+  if id -u $user >/dev/null 2>&1; then
+    echo "$user successfully created"
+  else
+    echo "create user failed - exiting process"
+    exit 1
+  fi
 fi
 
 home=$(eval echo "~$user")
@@ -287,11 +322,13 @@ if ! [ -d "$home/rtorrent/watch" ]; then
 mkdir $home/rtorrent/watch
 fi
 
-if [ -z "$webpass" ]; then
+if [ -z "$webpass" ] && [ -z $(grep -s $user $passfile) ]; then
   webpass=$(genpasswd)
 fi
 
-htpasswd -b $passfile $user $webpass
+if [ ! -z "$webpass" ]; then
+  htpasswd -b $passfile $user $webpass
+fi
 
 cp -f /etc/rtinst/conf/rtorrent.rc $home/.rtorrent.rc
 
@@ -316,12 +353,11 @@ echo "?>" >> /var/www/rutorrent/conf/users/$user/config.php
 mkdir /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi
 mkdir -p $home/.irssi/scripts/autorun
 cd $home/.irssi/scripts
-curl -sL http://git.io/vlcND | grep -Po '(?<="browser_download_url": ")(.*-v[\d.]+.zip)' | xargs wget --quiet -O autodl-irssi.zip
+curl -sL http://git.io/vlcND | sed -n 's/.*browser_download_url": \?"\(.*zip\)".*/\1/p' | xargs wget --quiet -O autodl-irssi.zip
 unzip -o autodl-irssi.zip >> /dev/null 2>&1
 rm autodl-irssi.zip
 cp autodl-irssi.pl autorun/
 mkdir -p $home/.autodl
-touch $home/.autodl/autodl.cfg && touch $home/.autodl/autodl2.cfg
 
 echo "<?php" > /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
 echo >> /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
@@ -331,13 +367,25 @@ echo >> /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
 echo "?>" >> /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
 
 cd $home/.autodl
-echo "[options]" > autodl2.cfg
-echo "gui-server-port = $adlport" >> autodl2.cfg
-echo "gui-server-password = $adlpass" >> autodl2.cfg
+
+if [ -f "autodl.cfg" ]; then
+  if (grep -sq gui-server-port autodl.cfg) && (grep -sq gui-server-password autodl.cfg); then
+    sed -i "/gui-server-port/ c\gui-server-port = $adlport" autodl.cfg
+    sed -i "/gui-server-password/ c\gui-server-password = $adlpass" autodl.cfg
+  else
+    sed -i '/gui-server-port/ d' autodl.cfg
+    sed -i '/gui-server-password/ d' autodl.cfg
+    echo >> autodl.cfg
+    sed -i "1s/^/[options]\ngui-server-port = $adlport\ngui-server-password = $adlpass\n/" autodl.cfg
+  fi
+else
+  echo "[options]" > autodl.cfg
+  echo "gui-server-port = $adlport" >> autodl.cfg
+  echo "gui-server-password = $adlpass" >> autodl.cfg
+fi
 
 chown -R $user:$user $home
 chown -R www-data:www-data /var/www/rutorrent
-chmod -R 755 /var/www/rutorrent
 
 if [ -z "$(crontab -u $user -l | grep "$cronline1")" ]; then
   (crontab -u $user -l; echo "$cronline1" ) | crontab -u $user -
@@ -350,14 +398,6 @@ fi
 su $user -c '/usr/local/bin/rt restart'
 su $user -c '/usr/local/bin/rt -i restart'
 
-dload_line=$(grep "include /etc/nginx/conf.d/rtdload;" /etc/nginx/sites-available/default)
-dload_hash=$(echo $dload_line | sed 's/[^#]*//g')
-if [ ! -z "$dload_line" -a -z "$dload_hash" ]; then
-dload_flag=0
-else
-dload_flag=1
-fi
-
 echo "$user setup complete"
 echo "SCGI Port: $newscgi"
 echo "RPC Mount: $newrpc"
@@ -371,18 +411,23 @@ echo
 ### WRITE RTINST.INFO ###
 ###############################
 
+echo > $home/rtinst.info
 if groups $user | grep -q -E ' sshuser(\s|$)' || groups $user | grep -q -E ' sudo(\s|$)'; then
 echo "$user has SSH access on port $sshport" | tee -a $home/rtinst.info
 echo
 fi
 echo "ftp client should be set to explicit ftp over tls using port $ftpport" | tee -a $home/rtinst.info
 echo
-if [ $dload_flag = 0 ]; then
+if [ "$rtdstatus" = "enabled" ]; then
 echo "https downloads can be accessed at https://$serverip/download/$user" | tee -a $home/rtinst.info
 echo
 fi
 echo "rutorrent can be accessed at https://$serverip/rutorrent" | tee -a $home/rtinst.info
-echo "rutorrent password set to $webpass" | tee -a $home/rtinst.info
+if [ -z $webpass ]; then
+  echo "rutorrent password has not been changed" | tee -a $home/rtinst.info
+else
+  echo "rutorrent password set to $webpass" | tee -a $home/rtinst.info
+fi
 echo "to change rutorrent password enter: rtpass" | tee -a $home/rtinst.info
 echo
 echo "The above info is stored at $home/rtinst.info"

scripts/rtadmin

@@ -16,16 +16,17 @@ select_task(){
 while true
   do
     read answer
-    case $answer in [1] ) rtgetscripts && return 0 ;;
+    case $answer in [1] ) rtsetup && return 0 ;;
                     [2] ) rtadduser && return 0 ;;
                     [3] ) rtremove && return 0 ;;
                     [4] ) rtdload $rtdaction && return 0 ;;
                     [5] ) rtupdate && return 0 ;;
                     [6] ) rutupgrade && return 0 ;;
                     [7] ) rtwebmin && return 0 ;;
-                    [8] ) rtsslcert && return 0 ;;
+                    [8] ) rtletsencrypt && return 0 ;;
+                    [9] ) rtsslcert && return 0 ;;
                    [Qq] ) exit ;;
-                      * ) echo "Enter 1-8 (q to quit)";;
+                      * ) echo "Enter 1-9 (q to quit)";;
     esac
   done
 }
@@ -46,14 +47,15 @@ clear
 echo "For more information go to:"
 echo "https://github.com/arakasi72/rtinst/blob/master/README.md"
 echo "Select from the following options:"
-echo "1.) rtgetscripts - update the rtinst scripts"
+echo "1.) rtsetup - update the rtinst scripts"
 echo "2.) rtadduser - add new user"
 echo "3.) rtremove - delete a user"
-echo "4.) rtdload $rtdaction - $rtdaction http downloads"
+echo "4.) rtdload $rtdaction - $rtdaction https downloads"
 echo "5.) rtupdate - up/down-grade rtorent/libtorrent"
 echo "6.) rutupgrade - upgrade to latest version of RuTorrent"
 echo "7.) rtwebmin - install webmin"
-echo "8.) rtsslcert - generate new self signed ssl certificate"
+echo "8.) rtletsencrypt - install Lets Encypt ssl certificate"
+echo "9.) rtsslcert - generate new self signed ssl certificate"
 echo "Enter option or q to quit"
 
 select_task

scripts/rtgetscripts

@@ -1,66 +0,0 @@
-#!/bin/bash
-
-######################################################################
-#
-#  Copyright (c) 2015 arakasi72 (https://github.com/arakasi72)
-#
-#  --> Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
-#
-######################################################################
-
-PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/bin:/sbin
-
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run as root, directly or with sudo"
-  exit 1
-fi
-
-if [ ! -d /etc/rtinst ]; then
-  git clone https://github.com/arakasi72/rtinst.git /etc/rtinst
-fi
-
-cd /etc/rtinst
-
-branch=$(basename "$(git symbolic-ref -q HEAD)")
-
-# if branch is empty then it is a tag
-if [ -z $branch ]; then
-  branch=$(git describe --tags --exact-match)
-  if [ ${branch:0:1} = v ]; then
-    git fetch origin
-    latest=$(git tag | sort -V | grep ^v | tail -1)
-    if [ $branch = $latest ]; then
-      echo "Already using the latest release: $branch"
-      exit
-    fi
-    # update to latest release
-    echo "rtinst updating from $branch to $latest"
-    cd
-    rm -fr /etc/rtinst
-    git clone -q https://github.com/arakasi72/rtinst.git /etc/rtinst
-    cd /etc/rtinst
-    git checkout -q $latest
-    branch=$(git describe --tags --exact-match)
-    echo "rtinst $branch installed"
-    cd
-    ln -sf /etc/rtinst/scripts/* /usr/local/bin
-    ln -sf /etc/rtinst/rtsetup /usr/local/bin
-    exit
-  else
-    echo "$branch is not a branch, or a numbered release"
-    echo "Run rtsetup if you want to switch to another build"
-    exit
-  fi
-fi
-
-if [ $(git ls-remote --heads https://github.com/arakasi72/rtinst.git $branch | wc -l) -eq 0 ]; then
-  echo "$branch no longer appears to exist"
-  echo "run rtsetup to reset branch"
-else
-  git fetch --all
-  git reset --hard origin/$branch 2>&1 >> /dev/null
-  git pull origin $branch
-
-  ln -sf /etc/rtinst/scripts/* /usr/local/bin
-  ln -sf /etc/rtinst/rtsetup /usr/local/bin
-fi

scripts/rtletsencrypt

@@ -0,0 +1,116 @@
+#!/bin/bash
+
+#########################################################################################
+#
+#  Copyright (c) 2015 arakasi72 (https://github.com/arakasi72)
+#
+#  --> Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+#
+#########################################################################################
+
+
+headless=0
+osname=$(lsb_release -si)
+releasename=$(lsb_release -cs)
+
+[ -z $logfile ] && logfile="/dev/null"
+if [ -z $serverip ]; then
+  headless=1
+fi
+
+#check it is being run as root
+if [ "$(id -u)" != "0" ]; then
+  echo "Must be run from root or using sudo" && exit 1
+fi
+
+if [ $headless = 1 ]; then
+  serveripa=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
+  serveripb=$(wget -qO- ipecho.net/plain)
+  serveripc=$(wget -qO- --timeout=3 ipinfo.io/ip)
+  if [ "$serveripa" = "$serveripb" ] || [ "$serveripa" = "$serveripc" ]; then
+    serverip=$serveripa
+  else
+    echo "Select the IP address to use:"
+    echo "1.) "$serveripa
+    echo "2.) "$serveripb
+    echo "3.) "$serveripc
+
+    while true
+      do
+        read answer
+        case $answer in [1] ) serverip=$serveripa && break ;;
+                        [2] ) serverip=$serveripb && break ;;
+                        [3] ) serverip=$serveripc && break ;;
+                          * ) echo "Enter 1, 2 or 3";;
+      esac
+    done
+  fi
+  serverdn=$(perl -MSocket -le "print((gethostbyaddr(inet_aton('$serverip'), AF_INET))[0])")
+fi
+
+echo "IP: $serverip"
+echo "DN: $serverdn"
+
+if [ -z $serverdn ]; then
+  echo "Unable to determine domain name cannot setup Lets Encypt"
+  exit 1
+fi
+
+# Remove apt version of Certbot if installed
+if [ $(dpkg-query -W -f='${Status}' "certbot" 2>/dev/null | grep -c "ok installed") = 1 ]; then
+  echo "Removing apt version of Certbot"
+  aptitude -q=5 -y remove certbot python*-certbot-nginx >> $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
+
+# Installing Certbot
+if [ $(snap list | grep -c "certbot") = 0 ]; then
+  echo "Installing certbot"
+  snap install --classic certbot >> $logfile 2>&1
+else
+  echo "certbot already installed"
+fi
+
+if [ $(snap list | grep -c "certbot") = 0 ]; then
+  echo "Install Failed"
+  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
+
+if [ $? = 1 ]; then
+  echo "unable to generate certificates"
+  exit 1
+fi
+
+echo "Certificates Generated"
+
+if [ $headless = 0 ]; then
+  exit 0
+fi
+
+if [ -d "/etc/letsencrypt/live/$serverdn" ]; then
+  echo "Replacing certificates in nginx and vsftpd"
+  
+  sed -i "/^\(\s\|#\)*server_name/ c\        server_name $serverdn;" /etc/nginx/sites-available/default
+  sed -i "/ssl_certificate / c\        ssl_certificate /etc/letsencrypt/live/$serverdn/fullchain.pem;" /etc/nginx/sites-available/default
+  sed -i "/ssl_certificate_key / c\        ssl_certificate_key /etc/letsencrypt/live/$serverdn/privkey.pem;" /etc/nginx/sites-available/default
+  
+  service nginx restart
+  
+  sed -i "/^\(\s\|#\)*rsa_cert_file/ c\rsa_cert_file=/etc/letsencrypt/live/$serverdn/fullchain.pem" /etc/vsftpd.conf
+  sed -i "/^\(\s\|#\)*rsa_private_key_file/ c\rsa_private_key_file=/etc/letsencrypt/live/$serverdn/privkey.pem" /etc/vsftpd.conf
+  
+  service vsftpd restart
+fi
+
+
+

scripts/rtsslcert

@@ -8,9 +8,9 @@
 #
 #########################################################################################
 
-
 forceyes=1
 headless=1
+selfsign=1
 
 #function to check if string is valid format for an ip address
 valid_ip()
@@ -53,13 +53,14 @@ echo ": done"
 if [ -f /etc/vsftpd.conf ]; then
   sed -i '/^\(\s\|#\)*rsa_private_key_file/ c\rsa_private_key_file=\/etc\/ssl\/private\/ruweb\.key' /etc/vsftpd.conf
   sed -i '/^\(\s\|#\)*rsa_cert_file/ c\rsa_cert_file=\/etc\/ssl\/ruweb\.crt' /etc/vsftpd.conf
-  service vsftpd restart
+  service vsftpd restart >/dev/null 2>&1
 fi
 
 if [ -f /etc/nginx/sites-available/default ]; then
   sed -i '/ssl_certificate / c\        ssl_certificate \/etc\/ssl\/ruweb\.crt;' /etc/nginx/sites-available/default
   sed -i '/ssl_certificate_key/ c\        ssl_certificate_key \/etc\/ssl\/private\/ruweb\.key;' /etc/nginx/sites-available/default
-  service nginx restart
+  sed -i "/^\(\s\|#\)*server_name/ c\        server_name $serverip;" /etc/nginx/sites-available/default
+  service nginx restart >/dev/null 2>&1
 fi
 }
 
@@ -71,12 +72,13 @@ fi
 # options -y and -d take away the user interaction so can be called from another script
 # option -y will force the creation of new certificates
 # option -d will not unless it determines they are needed
-while getopts ":yd" optname
+while getopts ":yds" optname
   do
     case $optname in
       "y" ) forceyes=0 ;;
       "d" ) headless=0 ;;
-        * ) echo "-y or -d only options allowed" && exit ;;
+      "s" ) selfsign=0 ;;
+        * ) echo "-y, -d, and -s only options allowed" && exit ;;
     esac
   done
 
@@ -87,19 +89,36 @@ if [ $forceyes = 0 ] && [ $headless = 0 ]; then
   exit
 fi
 
-if [ $# -gt 1 ]; then
-  echo "Only one argument allowed"
+if [ $# -gt 0 ]; then
+  echo "No arguments allowed"
   exit
 fi
 
-serverip=$1
-
 if [ -z $serverip ]; then
-  serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
-elif ! valid_ip $serverip; then
-  echo "$serverip is not a valid IP address"
-  serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
-  echo "will use $serverip instead"
+  serveripa=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
+  serveripb=$(wget -qO- ipecho.net/plain)
+  serveripc=$(wget -qO- --timeout=3 ipinfo.io/ip)
+  if [ "$serveripa" = "$serveripb" ] || [ "$serveripa" = "$serveripc" ]; then
+    serverip=$serveripa
+  else
+    echo "Select the IP address to use:"
+    echo "1.) "$serveripa
+    echo "2.) "$serveripb
+    echo "3.) "$serveripc
+
+    while true
+      do
+        read answer
+        case $answer in [1] ) serverip=$serveripa && break ;;
+                        [2] ) serverip=$serveripb && break ;;
+                        [3] ) serverip=$serveripc && break ;;
+                        * ) echo "Enter 1, 2 or 3";;
+      esac
+    done
+  fi
+
+  echo "IP set to "$serverip
+  echo
 fi
 
 serverdn=$(perl -MSocket -le "print((gethostbyaddr(inet_aton('$serverip'), AF_INET))[0])")

scripts/rtupdate

@@ -10,17 +10,77 @@
 
 PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/bin:/sbin
 
-RTFILE=/usr/local/bin/rt
+osname=$(lsb_release -si)
+relno=$(lsb_release -sr | cut -d. -f1)
+fullrelno=$(lsb_release -sr)
 
-duoversion="0.13.2/0.9.2 0.13.3/0.9.3 0.13.4/0.9.4 0.13.5/0.9.5 0.13.6/0.9.6"
-OSNAME=$(cat /etc/issue.net | cut -d' ' -f1)
+# Fallback if lsb_release -si returns nothing
+if [ "$osname" = "" ]; then
+  osname=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
+  osname=${osname^}
+fi
+
+# Fallback if lsb_release -sr returns nothing
+if [ "$relno" = "" ]; then
+  relno=$(grep -oP '(?<=^VERSION_ID=).+' /etc/os-release | tr -d '"' | cut -d. -f1)
+fi
+
+if [ "$fullrelno" = "" ]; then
+  fullrelno=$(grep -oP '(?<=^VERSION_ID=).+' /etc/os-release | tr -d '"')
+fi
 
 
+sourcedir='http://rtorrent.net/downloads/'
+
+xmlrpc_url='https://svn.code.sf.net/p/xmlrpc-c/code/stable/'
+xmlrpcloc='svn://svn.code.sf.net/p/xmlrpc-c/code/stable/'
+
+xmlrpc_url_alt='https://github.com/mirror/xmlrpc-c'
+xmlrpcloc_alt='https://github.com/mirror/xmlrpc-c/trunk/stable'
+
+rtdevrel=1
+
+if [ "$fullrelno" = "17.10" ]; then
+  rtdevrel=0
+fi
+
+if ([ "$osname" = "Debian" ] || [ "$osname" = "Raspbian" ] && [ $relno -ge 9 ]) || ([ "$osname" = "Ubuntu" ] && [ $relno -ge 18 ]); then
+  rtdevrel=0
+fi
+
+listsize=6
+duoversion=''
+passed_rtvers=$1
+[ -z $logfile ] && logfile="/dev/null"
+
+# get a list of the most recent releases
+rt_releases=$(wget -q -O - $sourcedir | grep -o "rtorrent-[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}\.tar.gz" | sort -uV | tail -$listsize | grep -o "[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}")
+
+# extract the release numbers from the list of most recent releases
+for rtversion in $rt_releases
+  do
+    libversion=$(echo $rtversion | awk -F. -v OFS=. '{$2='$(( $(echo $rtversion | cut -d. -f2) + 4 ))'; print }')
+    duoversion="$duoversion $libversion/$rtversion"
+  done
+
+# get the most recent release version number
+latest_duo=$(echo $duoversion | rev | cut -d' ' -f1 | rev)
+latest_libvers=$(echo $latest_duo | cut -d/ -f1)
+latest_rtvers=$(echo $latest_duo | cut -d/ -f2)
+
+# checks if an application is installed
 installed() {
 hash $1 2>/dev/null
 }
 
-ask_version() {
+#function to check if a web site is reachable
+check_url() {
+  if [[ `wget -S -T 3 --spider $1  2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then return 0; else return 1; fi
+}
+
+# function to create a list of versions to install
+list_version() {
+local verschoice
 while [ -z "$verschoice" ]
 do
   echo "Please select libtorrent/rtorrent version."
@@ -33,16 +93,16 @@ do
 done
 }
 
-confirm_answer() {
+ask_user(){
+local answer
 while true
-      do
-      read -p "Sure you wish to install libtorrent-"$libvers" and rtorrent-"$rtvers"?" answer
-      case $answer in [Yy]* ) return 0 ;;
-                      [Nn]* ) exit ;;
-                          * ) echo "Enter y or n";;
-      esac
-    done
-
+  do
+    read answer
+    case $answer in [Yy]* ) return 0 ;;
+                    [Nn]* ) return 1 ;;
+                        * ) echo "Enter y or n";;
+    esac
+  done
 }
 
 if [ "$(id -u)" != "0" ]; then
@@ -50,69 +110,154 @@ if [ "$(id -u)" != "0" ]; then
   exit 1
 fi
 
-if ( installed rtorrent ); then
-  rtorrent_current=$(rtorrent -h | grep -m 1 'version')
-  rtorrent_current=${rtorrent_current#*version }
-  echo "rtorrent $rtorrent_current detected"
-  echo
-else
-  echo "rtorrent NOT installed"
-  echo "This script is for upgrading/downgrading only, not for initial install"
+# Check the libtorrent/rtorrent and xmlrpc sites are available
+xmlrpc_repo=0
+rt_repo=0
+echo
+echo "Checking File Repositories"
+
+echo -n "xmlrpc-c: "; check_url $xmlrpc_url && echo "OK" ||  xmlrpc_repo=1
+
+if [[ $xmlrpc_repo = 1 ]]; then
+  xmlrpc_url=$xmlrpc_url_alt
+  xmlrpcloc=$xmlrpcloc_alt
+  check_url $xmlrpc_url && { echo "OK";  xmlrpc_repo=0; } || { echo "FAIL"; xmlrpc_repo=1; }
+fi
+
+echo -n "rtorrent: "; check_url $sourcedir && echo "OK" || { echo "FAIL"; rt_repo=1; }
+
+if [ $rt_repo = 1 ]; then
+  echo "The libtorrent/rtorrent file repositoy is offline"
+  echo "Try again later, you can check if the following address is online in your browser:"
+  echo $sourcedir
   exit 1
 fi
 
-ask_version
-confirm_answer
+if [ $xmlrpc_repo = 1 ]; then
+  if [ -d /usr/include/xmlrpc-c ]; then
+    echo "xmlrpc repository is off line, but looks like it has already beed installed."
+    echo "We will try and install rtorrent"
+  else
+    echo "The xmlrpc-c file repositoy is offline"
+    echo "Try again later, you can check if the following address is online in your browser:"
+    echo $xmlrpcloc
+    exit 1
+  fi
+fi
+
+if [ -z $passed_rtvers ]; then
+  if ( installed rtorrent ); then
+    rt_current=$(rtorrent -h | grep -om 1 "[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}")
+    echo "rtorrent $rt_current detected"
+  else
+    echo "rtorrent NOT installed"
+    echo "This script is for upgrading/downgrading only, not for initial install"
+    exit 1
+  fi
+
+# checks if the OS is debian 9, and forces the version to 0.9.7 of it is
+  if [ $rtdevrel = 0 ]; then
+    echo "For Debian 9, and Ubuntu 17.10 and later, recommend libtorrent-0.13.7/rtorrent-0.9.7 or later"
+  fi
+  
+  list_version
+  
+  echo "Install libtorrent-$libvers and rtorrent-$rtvers"
+  echo "Your rtorrent config, torrents, and data will not be lost or changed"
+  echo -n "Continue? "
+  if ! ask_user; then
+    exit
+  fi
+else
+  if [ "$passed_rtvers" = "latest" ] || [ $(wget -q -O - $sourcedir | grep -o "rtorrent-$passed_rtvers.tar.gz" | wc -l) -eq 0 ]; then
+    if [ "$passed_rtvers" != "latest" ]; then
+      echo " Could not find $passed_rtvers so using latest version instead"
+    fi
+    libvers=$latest_libvers
+    rtvers=$latest_rtvers
+  else
+    libvers=$(echo $passed_rtvers | awk -F. -v OFS=. '{$2='$(( $(echo $rtversion | cut -d. -f2) + 4 ))'; print }')
+    rtvers=$passed_rtvers
+  fi
+
+  # checks if the OS is debian 9, and forces the version to 0.9.7 of it is
+  if [ $rtdevrel = 0 ]; then
+    libvers='0.13.8'
+    rtvers='0.9.8'
+    echo "Debian 9, and Ubuntu 17.10 and later, are only supported by libtorrent-0.13.7/rtorrent-0.9.7 or later"
+  fi
+
+fi
+
+if [ -z "$home" ]; then
+  home=$HOME
+fi
 
 echo
-echo "Installing $libvers/$rtvers"
+echo "Installing libtorrent-$libvers/rtorrent-$rtvers"
 
-cd $HOME
+cd $home
 
 if [ -d source ]; then
   cd source
 else
   mkdir source && cd source
 fi
-rm -r -f libtorrent* rtorrent*
+rm -rf xmlrpc libtorrent* rtorrent*
 
 echo "Fetching source files"
-curl -# http://rtorrent.net/downloads/libtorrent-$libvers.tar.gz | tar xz
-curl -# http://rtorrent.net/downloads/rtorrent-$rtvers.tar.gz | tar xz
 
-echo "Compiling libtorrent"
-cd $HOME/source/libtorrent-$libvers
-./autogen.sh >> /dev/null 2>&1
-if [ "$OSNAME" = "Raspbian" ]; then
-    ./configure --prefix=/usr --disable-instrumentation >> /dev/null 2>&1
-  else
-    ./configure --prefix=/usr >> /dev/null 2>&1
+
+#if [ $rtdevrel = 0 ]; then
+#  git clone -q -b feature-bind --single-branch https://github.com/rakshasa/libtorrent.git libtorrent-$libvers
+#  git clone -q -b feature-bind --single-branch https://github.com/rakshasa/rtorrent.git rtorrent-$rtvers
+#else
+  curl -# http://rtorrent.net/downloads/libtorrent-$libvers.tar.gz | tar xz
+  curl -# http://rtorrent.net/downloads/rtorrent-$rtvers.tar.gz | tar xz
+#fi
+
+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
+
+  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 $home/source
 fi
-make -j2 >> /dev/null 2>&1
-make install >> /dev/null 2>&1
 
-echo "Compiling rtorrent"
-cd $HOME/source/rtorrent-$rtvers
-./autogen.sh >> /dev/null 2>&1
-./configure --prefix=/usr --with-xmlrpc-c >> /dev/null 2>&1
-make -j2 >> /dev/null 2>&1
-make install >> /dev/null 2>&1
-ldconfig
+cd libtorrent*
+echo "Installing libtorrent" | tee -a $logfile
+./autogen.sh >> $logfile 2>&1
+if [ $osname = "Raspbian" ]; then
+  ./configure --prefix=/usr --disable-instrumentation >> $logfile 2>&1
+else
+  ./configure --prefix=/usr >> $logfile 2>&1
+fi
+make -j$(nproc) >> $logfile 2>&1
+make -s install >> $logfile 2>&1
 
-cd /var/www/rutorrent/conf/users
-user_list=*
+cd ../rtorrent*
+echo "Installing rtorrent" | tee -a $logfile
+./autogen.sh >> $logfile 2>&1
+./configure --prefix=/usr --with-xmlrpc-c --enable-ipv6 >> $logfile 2>&1
+make -j$(nproc) >> $logfile 2>&1
+make -s install >> $logfile 2>&1
+ldconfig >> $logfile 2>&1
 
-for user in $user_list
-  do
+
+if [ -d /var/www/rutorrent/conf/users ]; then
+  cd /var/www/rutorrent/conf/users
+  user_list=*
+  for user in $user_list; do
     if [ ! "$user" = '*' ]; then
       echo "Restarting rtorrent for $user"
       su $user -c 'rt restart >> /dev/null 2>&1'
     fi
   done
-
-cd $HOME
-
-echo
-echo "$libvers/$rtvers installed"
-echo
-echo "Your .rtorrent.rc file, and download, watch, and .session directories have not been altered in any way"
+  echo
+fi

scripts/rtversion

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+######################################################################
+#
+#  Copyright (c) 2015 arakasi72 (https://github.com/arakasi72)
+#
+#  --> Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+#
+######################################################################
+
+sourcedir='http://rtorrent.net/downloads/'
+rt_latest=$(wget -q -O - $sourcedir | grep -o "rtorrent-[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}" | sort -uV | tail -1 | grep -o "[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}")
+ru_latest=$(curl -s https://raw.githubusercontent.com/Novik/ruTorrent/master/js/webui.js | grep -m 1 version: | cut -d \" -f2)
+
+# checks if an application is installed
+installed() {
+hash $1 2>/dev/null
+}
+
+if ( installed rtorrent ); then
+  rt_current=$(rtorrent -h | grep -om 1 "[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}")
+  echo "rtorrent installed: $rt_current"
+  echo "rtorrent available: $rt_latest"
+else
+  echo "rtorrent: not installed"
+fi
+
+echo
+
+if [ -d /var/www/rutorrent ]; then
+  ru_current=$(grep -m 1 version: /var/www/rutorrent/js/webui.js | cut -d \" -f2)
+  echo "RuTorrent installed: $ru_current"
+  echo "RuTorrent available: $ru_latest"
+else
+  echo "RuTorrent: not installed"
+fi
+
+echo
+
+echo "rtinst"
+cd /etc/rtinst
+branch=$(basename "$(git symbolic-ref -q HEAD)")
+if [ -z $branch ]; then
+  branch=$(git describe --tags --exact-match)
+  echo "Current Release: rtinst $branch"
+  if [ ${branch:0:1} = v ]; then
+    latest=$(basename "$(git ls-remote --tags https://github.com/arakasi72/rtinst.git | grep -o 'refs/tags/v.*' | sort -V | tail -1)")
+    if [ $branch = $latest ]; then
+      echo "This is the latest release"
+    else
+      echo "Use rtsetup to update to rtinst $latest"
+    fi   
+  fi
+else
+  echo "Current Branch: $branch"
+  echo "Use rtsetup to update branch"
+fi

scripts/rtwebmin

@@ -9,7 +9,7 @@
 ######################################################################
 
 PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/bin:/sbin
-serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
+serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
 
 if [ "$(id -u)" != "0" ]; then
   echo "Must be run as root, directly or with sudo"
@@ -20,8 +20,8 @@ if [ $(dpkg-query -W -f='${Status}' webmin 2>/dev/null | grep -c "ok installed")
   echo "Installing Webmin"
   echo "deb http://download.webmin.com/download/repository sarge contrib" > /etc/apt/sources.list.d/webmin.list
   wget -qO - http://www.webmin.com/jcameron-key.asc | apt-key add -
-  apt-get update  >> /dev/null 2>&1
-  apt-get -y install webmin  >> /dev/null 2>&1
+  aptitude -q=5 update
+  aptitude -q=5 -y install webmin
 else
   echo 'Webmin is already installed'
 fi

scripts/rutupgrade

@@ -14,19 +14,45 @@ newvers=$(curl -s https://raw.githubusercontent.com/Novik/ruTorrent/master/js/we
 oldvers=$(grep -m 1 version: /var/www/rutorrent/js/webui.js | cut -d \" -f2)
 
 ruflag=0
+rurelease=$(curl -s "https://api.github.com/repos/Novik/ruTorrent/releases/latest" | awk -F '"' '/tag_name/{print $4}')
+force_yes=1
+restore_old=1
+install_master=1
 
-ask_option() {
- while true
-    do
-      echo "1. Restore rutorrent_old"
-      echo "2. Upgrade to latest version"
-      read -p "Select 1 or 2: " answer
-      case $answer in [1]* ) return 0 ;;
-                      [2]* ) return 1 ;;
+ask_restore() {
+  if [ $force_yes = 0 ]; then
+    return $restore_old
+  else
+    while true
+      do
+        echo "1. Restore rutorrent_old"
+        echo "2. Upgrade to latest version"
+        read -p "Select 1 or 2: " answer
+        case $answer in [1]* ) return 0 ;;
+                        [2]* ) return 1 ;;
       esac
     done
+  fi
 }
 
+ask_version() {
+  if [ $force_yes = 0 ]; then
+    return $install_master
+  else
+    echo "Choose which build to install, (if you are not sure select 1)"
+    while true
+      do
+        echo "1. Use the latest stable release"
+        echo "2. Use the most recent master build"
+        read -p "Select 1 or 2: " answer
+        case $answer in [1]* ) return 1 ;;
+                        [2]* ) return 0 ;;
+      esac
+    done
+  fi
+}
+
+
 check_user() {
 while true
   do
@@ -43,6 +69,21 @@ if [ "$(id -u)" != "0" ]; then
   echo "Must be run from root or using sudo" && exit 1
 fi
 
+# get options
+OPTS=$(getopt -n "$0" -o myo --long "rutorrent-master,force-yes,restore-old" -- "$@")
+
+eval set -- "$OPTS"
+
+while true; do
+  case "$1" in
+    -m | --rutorrent-master ) install_master=0; shift;;
+    -y | --force-yes ) force_yes=0; shift;;
+    -o | --restore-old ) restore_old=0; shift;;
+    -- ) shift; break ;;
+     * ) break ;;
+  esac
+done
+
 #check rutorrent folder exists
 if ! [ -d '/var/www/rutorrent' ]; then
 echo 'Could not find /var/www/rutorrent, exiting script'
@@ -50,31 +91,33 @@ exit
 fi
 
 #check versions
-if [ '$newvers' = '$oldvers' ]; then
-  echo "You have the latest version: "$newvers
-else
-  echo "Installed version: "$oldvers
-  echo "   Latest version: "$newvers
+echo "Installed version: "$oldvers
+echo "   Latest version: "$newvers
+
+if [ -d $HOME'/rutorrent_old' ]; then
+  echo
+  echo "A previous backup is available to restore"
+  echo
 fi
 
-if ! ( check_user ); then
+if [ $restore_old = 0 ] && ! [ -d $HOME'/rutorrent_old' ]; then
+  echo "No backup available to do a restore"
   exit
 fi
 
 #check to see if rutorrent_old exists, offer restore or upgrade options
 if [ -d $HOME'/rutorrent_old' ];then
 echo 'Detected '$HOME'/rutorrent_old'
-  if ( ask_option ); then
+  if ( ask_restore ); then
     echo "Restoring Old version of rutorrent"
     echo "WARNING: The current rutorrent will be overwitten by older backup"
     ruflag=1
-    if ( check_user ); then
+    if [ $force_yes = 0 ] || ( check_user ); then
       echo "Restoring"
       rm -r /var/www/rutorrent
       mv -f $HOME/rutorrent_old /var/www/rutorrent
       echo "Setting permissions, Starting services"
       chown -R www-data:www-data /var/www
-      chmod -R 755 /var/www/rutorrent
       echo "Done"
     else
       exit
@@ -82,8 +125,8 @@ echo 'Detected '$HOME'/rutorrent_old'
   else
     echo "Rutorrent will be upgraded"
     echo "WARNING: rutorrent_old will be deleted"
-	echo "If you wish to retain this older version you should exit this script, and rename or move it"
-    if ( check_user ); then
+    echo "If you wish to retain this older version you should exit this script, and rename or move it"
+    if [ $force_yes = 0 ] || ( check_user ); then
       ruflag=0
     else
       exit
@@ -93,9 +136,13 @@ fi
 
 if [ $ruflag = 0 ]; then
 
+  if ( ask_version ); then
+    rurelease=master
+  fi
+
   if [ -d $HOME'/rutorrent_old' ]; then
     rm -r $HOME/rutorrent_old
-	echo "rutorrent_old has been deleted"
+    echo "rutorrent_old has been deleted"
   fi
 
   echo
@@ -106,10 +153,13 @@ if [ $ruflag = 0 ]; then
   echo
 
   mv -f /var/www/rutorrent $HOME/rutorrent_old
+  echo "Installing Rutorrent ($rurelease)"
+  wget -q https://github.com/Novik/ruTorrent/archive/$rurelease.tar.gz
+  tar -xzf $rurelease.tar.gz
+  mv -f $(tar -tzf $rurelease.tar.gz | head -1) /var/www/rutorrent
+  rm $rurelease.tar.gz
 
-  echo "Installing Rutorrent "$newvers
-  git clone https://github.com/Novik/ruTorrent.git /var/www/rutorrent  >> /dev/null 2>&1
-  git clone https://github.com/autodl-community/autodl-rutorrent.git /var/www/rutorrent/plugins/autodl-irssi  >> /dev/null 2>&1
+  git clone -q https://github.com/autodl-community/autodl-rutorrent.git /var/www/rutorrent/plugins/autodl-irssi
 
   rm -r /var/www/rutorrent/conf  >> /dev/null 2>&1
   cp -r $HOME/rutorrent_old/conf /var/www/rutorrent/conf  >> /dev/null 2>&1
@@ -117,5 +167,6 @@ if [ $ruflag = 0 ]; then
   cp -r $HOME/rutorrent_old/share /var/www/rutorrent/share >> /dev/null 2>&1
   echo "Setting permissions, Starting services"
   chown -R www-data:www-data /var/www
-  chmod -R 755 /var/www/rutorrent
+  echo
+  echo "Installation of RuTorrent complete"
 fi