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 15
+	Ubuntu 14 (unsupported)
+	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
 

scripts/rtinst

@@ -15,7 +15,7 @@
 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/"
@@ -35,27 +35,27 @@ 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
+
+if [ "$relno" = "10" ]; then
+  phpver=php7.3
+  phploc=/etc/php/7.3
   libcver=libcurl4
 fi
 
@@ -92,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-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
@@ -256,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
@@ -555,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-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
+  apt-get -qq install ffmpeg >> $logfile 2>&1
 fi
 
 echo "Completed installation of required packages        "

scripts/rtupdate

@@ -22,12 +22,12 @@ 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
-  sourcedir='https://github.com/rakshasa/'
+if ([ "$osname" = "Debian" ] || [ "$osname" = "Raspbian" ] && [ $relno -ge 9 ]) || ([ "$osname" = "Ubuntu" ] && [ $relno -ge 18 ]); then
+  rtdevrel=0
 fi
 
 listsize=6
@@ -139,13 +139,11 @@ if [ -z $passed_rtvers ]; then
 
 # 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.7'
-    rtvers='0.9.7'
-    echo "Debian 9, and Ubuntu 17.10 and later, are only supported by libtorrent-0.13.7/rtorrent-0.9.7"
-  else
-    list_version
+    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? "
@@ -166,9 +164,9 @@ else
 
   # 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.7'
-    rtvers='0.9.7'
-    echo "Debian 9, and Ubuntu 17.10 and later, are only supported by libtorrent-0.13.7/rtorrent-0.9.7"
+    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
@@ -192,13 +190,13 @@ rm -rf xmlrpc libtorrent* rtorrent*
 echo "Fetching source files"
 
 
-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
+#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
+#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