Develop (#420)

* Update rtinst

* Update README.md

* Update rtinst

* Update rtinst

* Update rtinst

* Update rtinst

* Update rtinst

* Update README.md

* Update rtinst

* Update rtupdate

* Update rtupdate

README.md

@@ -25,14 +25,16 @@ It has been tested with clean installs of:
 
 	Ubuntu 12 (unsupported)
 	Ubuntu 13 (unsupported)
-	Ubuntu 14
+	Ubuntu 14 (unsupported)
-	Ubuntu 15
+	Ubuntu 15 (unsupported)
 	Ubuntu 16
 	Ubuntu 17
 	Ubuntu 18
+	Ubuntu 19
 	Debian 7 "Wheezy" (unsupported)
-	Debian 8 "Jessie"
+	Debian 8 "Jessie" (unsupported)
 	Debian 9 "Stretch"
+	Debian 10 "Buster"
 
 Services that will be installed and configured are
 

conf/rtorrent.rc

@@ -8,7 +8,7 @@ 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")

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

rtsetup

@@ -31,6 +31,20 @@ if [ "$(id -u)" != "0" ]; then
   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
+
+# wait until `apt-get updated` has been killed
+  while ! (systemctl list-units --all apt-daily.service | fgrep -q dead)
+    do
+      sleep 1;
+    done
+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

scripts/rtadmin

@@ -49,7 +49,7 @@ echo "Select from the following options:"
 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"

scripts/rtinst

@@ -15,12 +15,12 @@
 PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/bin:/sbin
 
 # if left blank will install latest version of rtorrent, or set to a specific release E.G. '0.9.6' to install that release
-rtorrentrel=''
+rtorrentrel='0.9.6'
 
 #url's of the major components
 rt_url="http://rtorrent.net/downloads/"
 
-xmlrpc_url="https://svn.code.sf.net/p/xmlrpc-c/code/stable/"
+xmlrpc_url="https://svn.code.sf.net/p/xmlrpc-c/code/advanced/"
 xmlrpc_url_alt="https://github.com/mirror/xmlrpc-c"
 
 ru_url="https://github.com/Novik/ruTorrent/"
@@ -35,31 +35,53 @@ fullrel=$(lsb_release -sd)
 osname=$(lsb_release -si)
 relno=$(lsb_release -sr | cut -d. -f1)
 
-phpver=php5
-phploc=/etc/php5
-geoipver=php5-geoip
-libcver=libcurl3
-
 if [ "$relno" = "16" ] || [ "$relno" = "17" ] || [ "$relno" = "9" ]; then
   phpver=php7.0
   phploc=/etc/php/7.0
-  geoipver=php-geoip
+  libcver=libcurl3
 fi
 
 if [ $(lsb_release -sr) = "17.10" ]; then
   phpver=php7.1
   phploc=/etc/php/7.1
-  geoipver=php-geoip
+  libcver=libcurl3
 fi
 
-if [ "$relno" = "18" ]; then
+if [ "$relno" = "18" ] || [ "$relno" = "19" ]; then
   phpver=php7.2
   phploc=/etc/php/7.2
-  geoipver=php-geoip
   libcver=libcurl4
 fi
 
-export serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
+if [ "$relno" = "10" ]; then
+  phpver=php7.3
+  phploc=/etc/php/7.3
+  libcver=libcurl4
+fi
+
+serveripa=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
+serveripb=$(wget -qO- ipecho.net/plain)
+
+if [ "$serveripa" = "$serveripb" ]; then
+  export serverip=$serveripa
+else
+  echo "Select the IP address to use:"
+  echo "1.) "$serveripa
+  echo "2.) "$serveripb
+
+  while true
+    do
+      read answer
+      case $answer in [1] ) export serverip=$serveripa && break ;;
+                      [2] ) export serverip=$serveripb && break ;;
+                        * ) echo "Enter 1 or 2";;
+    esac
+  done
+fi
+
+echo "IP set to "$serverip
+
+
 export logfile="/dev/null"
 webpass=''
 cronline1="@reboot sleep 10; /usr/local/bin/rtcheck irssi rtorrent"
@@ -70,9 +92,9 @@ portdefault=1
 skip_rt=1
 sshport=''
 rudevflag=1
-rurelease=master
+rurelease=masterlibterm-readline-gnu-pe
 passfile='/etc/nginx/.htpasswd'
-package_list="sudo nano autoconf build-essential ca-certificates comerr-dev curl cfv dtach htop irssi libcloog-ppl-dev libcppunit-dev $libcver libncurses5-dev libterm-readline-gnu-perl libsigc++-2.0-dev libperl-dev libtool libxml2-dev ncurses-base ncurses-term ntp patch pkg-config $phpver-fpm $phpver $phpver-cli $phpver-dev $phpver-curl $geoipver $phpver-mcrypt $phpver-xmlrpc python-scgi screen subversion texinfo unzip zlib1g-dev libcurl4-openssl-dev mediainfo software-properties-common aptitude $phpver-json nginx-full apache2-utils git libarchive-zip-perl libnet-ssleay-perl libhtml-parser-perl libxml-libxml-perl libjson-perl libjson-xs-perl libxml-libxslt-perl libjson-rpc-perl libarchive-zip-perl"
+package_list="sudo nano autoconf build-essential ca-certificates comerr-dev curl dtach htop irssi libcppunit-dev $libcver libncurses5-dev libterm-readline-gnu-perl libsigc++-2.0-dev libperl-dev libtool libxml2-dev ncurses-base ncurses-term ntp patch pkg-config $phpver-fpm $phpver $phpver-cli $phpver-dev $phpver-curl php-geoip $phpver-xmlrpc python-scgi screen subversion texinfo unzip zlib1g-dev libcurl4-openssl-dev mediainfo software-properties-common aptitude $phpver-json nginx-full apache2-utils git libarchive-zip-perl libnet-ssleay-perl libhtml-parser-perl libxml-libxml-perl libjson-perl libjson-xs-perl libxml-libxslt-perl libjson-rpc-perl libarchive-zip-perl"
 Install_list=""
 unixpass=""
 passflag=0
@@ -234,11 +256,11 @@ if [ "$(id -u)" != "0" ]; then
 fi
 
 # determine system
-if ([ "$osname" = "Ubuntu" ] && [ $relno -ge 14 ]) || ([ "$osname" = "Debian" ] && [ $relno -ge 8 ])  || ([ "$osname" = "Raspbian" ] && [ $relno -ge 8 ]); then
+if ([ "$osname" = "Ubuntu" ] && [ $relno -ge 16 ]) || ([ "$osname" = "Debian" ] && [ $relno -ge 9 ])  || ([ "$osname" = "Raspbian" ] && [ $relno -ge 9 ]); then
   echo $fullrel
 else
  echo $fullrel
- echo "Only Ubuntu release 14 and later, and Debian and Raspbian release 8 and later, are supported"
+ echo "Only Ubuntu release 16 and later, and Debian and Raspbian release 9 and later, are supported"
  echo "Your system does not appear to be supported"
  echo "Check https://github.com/arakasi72/rtinst/wiki/Installing-on-Older-OS to see if it is supported by an earlier rtinst release"
  exit
@@ -449,6 +471,19 @@ echo "No more user input required, you can complete unattended"
 echo "It will take approx 10 minutes for the script to complete"
 echo
 
+# 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 >> $logfile 2>&1
+  systemctl kill --kill-who=all apt-daily.service >> $logfile 2>&1
+
+# wait until `apt-get updated` has been killed
+  while ! (systemctl list-units --all apt-daily.service | fgrep -q dead)
+    do
+      sleep 1;
+    done
+
+fi
+
 #update amd upgrade system
 echo "Updating package lists" | tee $logfile
 apt-get -qq update | tee -a $logfile
@@ -520,19 +555,7 @@ fi
 #install ffmpeg
 if ! [ $osname = "Raspbian" ] && [ $(dpkg-query -W -f='${Status}' "ffmpeg" 2>/dev/null | grep -c "ok installed") = 0 ]; then
   echo "Installing ffmpeg"
-  if [ $relno = 14 ]; then
+  apt-get -qq install ffmpeg >> $logfile 2>&1
-    apt-add-repository -y ppa:mc3man/trusty-media >> $logfile 2>&1
-    apt-get -qq update >> $logfile 2>&1
-    apt-get -qq install ffmpeg >> $logfile 2>&1
-  elif [ $relno = 8 ]; then
-    grep "deb http://www.deb-multimedia.org jessie main" /etc/apt/sources.list >> /dev/null || echo "deb http://www.deb-multimedia.org jessie main" >> /etc/apt/sources.list
-    apt-get -qq update >> $logfile 2>&1
-    apt-get -qq --force-yes install deb-multimedia-keyring >> $logfile 2>&1
-    apt-get -qq update >> $logfile 2>&1
-    apt-get -qq --force-yes install ffmpeg >> $logfile 2>&1
-  else
-    apt-get -qq install ffmpeg >> $logfile 2>&1
-  fi
 fi
 
 echo "Completed installation of required packages        "

scripts/rtsslcert

@@ -8,7 +8,6 @@
 #
 #########################################################################################
 
-
 forceyes=1
 headless=1
 selfsign=1
@@ -95,11 +94,27 @@ if [ $# -gt 0 ]; then
 fi
 
 if [ -z $serverip ]; then
-  serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
+  serveripa=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
-elif ! valid_ip $serverip; then
+  serveripb=$(wget -qO- ipecho.net/plain)
-  echo "$serverip is not a valid IP address"
+  if [ "$serveripa" = "$serveripb" ]; then
-  serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
+    serverip=$serveripa
-  echo "will use $serverip instead"
+  else
+    echo "Select the IP address to use:"
+    echo "1.) "$serveripa
+    echo "2.) "$serveripb
+
+    while true
+      do
+        read answer
+        case $answer in [1] ) serverip=$serveripa && break ;;
+                        [2] ) serverip=$serveripb && break ;;
+                          * ) echo "Enter 1 or 2";;
+      esac
+    done
+  fi
+
+  echo "IP set to "$serverip
+  echo
 fi
 
 serverdn=$(perl -MSocket -le "print((gethostbyaddr(inet_aton('$serverip'), AF_INET))[0])")

scripts/rtupdate

@@ -14,20 +14,20 @@ osname=$(lsb_release -si)
 relno=$(lsb_release -sr | cut -d. -f1)
 sourcedir='http://rtorrent.net/downloads/'
 
-xmlrpc_url='https://svn.code.sf.net/p/xmlrpc-c/code/stable/'
+xmlrpc_url='https://svn.code.sf.net/p/xmlrpc-c/code/advanced/'
-xmlrpcloc='svn://svn.code.sf.net/p/xmlrpc-c/code/stable/'
+xmlrpcloc='svn://svn.code.sf.net/p/xmlrpc-c/code/advanced/'
 
 xmlrpc_url_alt='https://github.com/mirror/xmlrpc-c'
-xmlrpcloc_alt='https://github.com/mirror/xmlrpc-c/trunk/stable'
+xmlrpcloc_alt='https://github.com/mirror/xmlrpc-c/trunk/advanced'
 
 rtdevrel=1
 
-if [ $relno = 9 ] || [ $(lsb_release -sr) = 17.10 ] || [ $relno = 18 ]; then
+if [ $(lsb_release -sr) = 17.10 ]; then
   rtdevrel=0
 fi
 
-if [ $rtdevrel = 0 ]; then
+if ([ "$osname" = "Debian" ] || [ "$osname" = "Raspbian" ] && [ $relno -ge 9 ]) || ([ "$osname" = "Ubuntu" ] && [ $relno -ge 18 ]); then
-  sourcedir='https://github.com/rakshasa/'
+  rtdevrel=0
 fi
 
 listsize=6
@@ -137,15 +137,13 @@ if [ -z $passed_rtvers ]; then
     exit 1
   fi
 
-# checks if the OS is debian 9, and forces the version to 0.9.6 of it is
+# 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.6'
+    echo "For Debian 9, and Ubuntu 17.10 and later, recommend libtorrent-0.13.7/rtorrent-0.9.7 or later"
-    rtvers='0.9.6'
-    echo "Debian 9 and Ubuntu 17.10 are only supported by libtorrent-0.13.6/rtorrent-0.9.6"
-  else
-    list_version
   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? "
@@ -164,11 +162,11 @@ else
     rtvers=$passed_rtvers
   fi
 
-  # checks if the OS is debian 9, and forces the version to 0.9.6 of it is
+  # 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.6'
+    libvers='0.13.8'
-    rtvers='0.9.6'
+    rtvers='0.9.8'
-    echo "Debian 9 and Ubuntu 17.10 are only supported by libtorrent-0.13.6/rtorrent-0.9.6"
+    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
@@ -192,13 +190,13 @@ rm -rf xmlrpc libtorrent* rtorrent*
 echo "Fetching source files"
 
 
-if [ $rtdevrel = 0 ]; then
+#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/libtorrent.git libtorrent-$libvers
-  git clone -q -b feature-bind --single-branch https://github.com/rakshasa/rtorrent.git rtorrent-$rtvers
+#  git clone -q -b feature-bind --single-branch https://github.com/rakshasa/rtorrent.git rtorrent-$rtvers
-else
+#else
   curl -# http://rtorrent.net/downloads/libtorrent-$libvers.tar.gz | tar xz
   curl -# http://rtorrent.net/downloads/rtorrent-$rtvers.tar.gz | tar xz
-fi
+#fi
 
 if [ $xmlrpc_repo = 0 ]; then
   svn co $xmlrpcloc xmlrpc  >> $logfile 2>&1
@@ -225,7 +223,7 @@ make -s install >> $logfile 2>&1
 cd ../rtorrent-$rtvers
 echo "Installing rtorrent" | tee -a $logfile
 ./autogen.sh >> $logfile 2>&1
-./configure --prefix=/usr --with-xmlrpc-c >> $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