Update rtinst

* Update rtinst

* Update rtinst

* Update rtsslcert

* Update rtsslcert

* Update rtsslcert

* Update rtsslcert

* Update rtsslcert

* Update rtinst

* Update rtupdate

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,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/"
@@ -59,8 +59,29 @@ if [ "$relno" = "18" ]; then
   libcver=libcurl4
 fi
 
-export serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
+serveripa=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
-# export serverip=$(wget -qO- ipecho.net/plain)
+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"

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

@@ -225,7 +225,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