Merge pull request #505 from V33m/patch-4

Update rutupgrade - Fetch latest release
Merge pull request #496 from V33m/patch-3
2026-10-06 17:16:22 +00:00 · 2020-07-04 18:09:40 +01:00 · 2020-07-04 18:08:58 +01:00 · 2020-07-04 18:07:24 +01:00 · 2020-07-02 19:01:41 +02:00 · 2020-04-26 11:25:46 +02:00
3 changed files with 13 additions and 7 deletions
@@ -353,7 +353,7 @@ 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/
@@ -202,8 +202,8 @@ fullrel=$(lsb_release -sd)
 osname=$(lsb_release -si)
 relno=$(lsb_release -sr | cut -d. -f1)

-# Fallback if lsb_release -si returns nothing
-if [ "$osname" = "" ]; then
+# Fallback if lsb_release -si returns anything else than Ubuntu, Debian or Raspbian
+if [ ! "$osname" = "ubuntu" ] && [ ! "$osname" = "debian" ] && [ ! "$osname" = "raspbian" ]; then
  osname=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
  osname=${osname^}
 fi
@@ -237,8 +237,14 @@ if [ "$relno" = "10" ] || [ "$(lsb_release -sr)" = "19.10" ]; then
  libcver=libcurl4
 fi

+if [ "$relno" = "20" ] || [ "$(lsb_release -sr)" = "20.04" ]; then
+  phpver=php7.4
+  phploc=/etc/php/7.4
+  libcver=libcurl4
+fi
+
 serveripa=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
-serveripb=$(wget -qO- ipecho.net/plain)
+serveripb=$(wget -qO- --timeout=3 ipecho.net/plain)

 if [ "$serveripa" = "$serveripb" ]; then
  serverip=$serveripa
@@ -272,7 +278,7 @@ sshport=''
 rudevflag=1
 rurelease=master
 passfile='/etc/nginx/.htpasswd'
-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 $phpver-xml 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 $phpver-xml 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
@@ -909,7 +915,7 @@ adlpass=$(genpasswd $(random 12 16))

 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 -qq -o autodl-irssi.zip | tee -a $logfile
 rm autodl-irssi.zip
 cp autodl-irssi.pl autorun/
@@ -14,7 +14,7 @@ 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=$(git ls-remote -t https://github.com/Novik/ruTorrent v\* | cut -d/ -f3 | sort -V | tail -1)
+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
Author	SHA1	Message	Date
arakasi72	d2869bf416	Merge pull request #505 from V33m/patch-4 Update rutupgrade - Fetch latest release	2020-07-04 18:09:40 +01:00
arakasi72	e6523c1956	Merge pull request #496 from V33m/patch-3 Fallback if lsb_release -si does not return Ubuntu, Debian or Raspbian	2020-07-04 18:08:58 +01:00
arakasi72	3df3171d5c	Merge pull request #494 from V33m/patch-2 Add support for Ubuntu 20.04	2020-07-04 18:07:24 +01:00
V33m	227eb998f2	Update rutupgrade - Fetch latest release Updates the method for how latest releases are found. Prior method sorted by name, which made suffixes such as -beta prioritised over stable (v3.10-beta over v3.10 etc.).	2020-07-02 19:01:41 +02:00
V33m	3613eae1d9	Fallback if lsb_release -si does not return Ubuntu, Debian or Raspbian Adds a fallback if lsb_release -si returns anything else than Ubuntu, Debian or Raspbian. Should solve https://github.com/arakasi72/rtinst/issues/495. Needs testing and confirmation.	2020-04-26 11:25:46 +02:00
V33m	6c5191a144	Add support for Ubuntu 20.04 I've removed the package "python-scgi" which is for python2, however, we need to figure out if any packages are dependent on it for older OSes and if we need a supplement to it for python3 and future releases. PS: I've not tested this by myself. https://github.com/arakasi72/rtinst/issues/493	2020-04-25 10:14:41 +02:00
arakasi72	eef6d04d9d	Merge pull request #486 from KaffeMyers/master fix autodl-irrsi url extract	2020-03-31 09:42:34 +01:00
Simon "Kaffe" Wagemyr	bde4bb2492	small fix for safety (account for possible whitespace, which probably was the original issue)	2020-03-31 04:01:42 +02:00
Simon "Kaffe" Wagemyr	e7679d897b	fix autodl-irrsi url extract	2020-03-31 03:46:13 +02:00
arakasi72	ba2a315b37	Update rtinst	2019-12-18 16:41:57 +00:00