mirror of
https://github.com/elisspace/rtinst.git
synced 2026-10-07 01:26:24 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
16ddfa0325 |
+5
-5
@@ -199,11 +199,11 @@ if [ $(dpkg-query -W -f='${Status}' lsb-release 2>/dev/null | grep -c "ok instal
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
fullrel=$(lsb_release -sd)
|
fullrel=$(lsb_release -sd)
|
||||||
osname=$(lsb_release -si); osname=${osname^}
|
osname=$(lsb_release -si)
|
||||||
relno=$(lsb_release -sr | cut -d. -f1)
|
relno=$(lsb_release -sr | cut -d. -f1)
|
||||||
|
|
||||||
# Fallback if lsb_release -si returns anything else than Ubuntu, Debian or Raspbian
|
# Fallback if lsb_release -si returns anything else than Ubuntu, Debian or Raspbian
|
||||||
if [ ! "$osname" = "Ubuntu" ] && [ ! "$osname" = "Debian" ] && [ ! "$osname" = "Raspbian" ]; then
|
if [ ! "$osname" = "ubuntu" ] && [ ! "$osname" = "debian" ] && [ ! "$osname" = "raspbian" ] && [ ! "$osname" = "Linuxmint" ]; then
|
||||||
osname=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
|
osname=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
|
||||||
osname=${osname^}
|
osname=${osname^}
|
||||||
fi
|
fi
|
||||||
@@ -301,11 +301,11 @@ if [ "$(id -u)" != "0" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# determine system
|
# determine system
|
||||||
if ([ "$osname" = "Ubuntu" ] && [ $relno -ge 16 ]) || ([ "$osname" = "Debian" ] && [ $relno -ge 9 ]) || ([ "$osname" = "Raspbian" ] && [ $relno -ge 9 ]); then
|
if ([ "$osname" = "Ubuntu" ] && [ $relno -ge 16 ]) || ([ "$osname" = "Debian" ] && [ $relno -ge 9 ]) || ([ "$osname" = "Raspbian" ] && [ $relno -ge 9 ]) || ([ "$osname" = "Linuxmint" ] && [ $relno -ge 16 ]); then
|
||||||
echo $fullrel
|
echo $fullrel
|
||||||
else
|
else
|
||||||
echo $fullrel
|
echo $fullrel
|
||||||
echo "Only Ubuntu release 16 and later, and Debian and Raspbian release 9 and later, are supported"
|
echo "Only Ubuntu and Linux Mint release 16 and later, and Debian and Raspbian release 9 and later, are supported"
|
||||||
echo "Your system does not appear to be 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"
|
echo "Check https://github.com/arakasi72/rtinst/wiki/Installing-on-Older-OS to see if it is supported by an earlier rtinst release"
|
||||||
exit
|
exit
|
||||||
@@ -613,7 +613,7 @@ if [ $osname = "Debian" ] && ! installed unrar; then
|
|||||||
cp $home/rar/unrar /bin/unrar
|
cp $home/rar/unrar /bin/unrar
|
||||||
rm -r $home/rar
|
rm -r $home/rar
|
||||||
fi
|
fi
|
||||||
elif [ $osname = "Ubuntu" ]; then
|
elif [ $osname = "Ubuntu" || $osname = "Linuxmint" ]; then
|
||||||
aptitude -q=5 -y install unrar >> $logfile 2>&1
|
aptitude -q=5 -y install unrar >> $logfile 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ if [ $osname = "Debian" ]; then snap install core >> $logfile 2>&1; snap refresh
|
|||||||
# Installing Certbot
|
# Installing Certbot
|
||||||
if [ $(snap list | grep -c "certbot") = 0 ]; then
|
if [ $(snap list | grep -c "certbot") = 0 ]; then
|
||||||
echo "Installing certbot"
|
echo "Installing certbot"
|
||||||
snap install --classic certbot >> $logfile 2>&1
|
snap -y install --classic certbot >> $logfile 2>&1
|
||||||
else
|
else
|
||||||
echo "certbot already installed"
|
echo "certbot already installed"
|
||||||
fi
|
fi
|
||||||
@@ -80,8 +80,6 @@ if [ $(snap list | grep -c "certbot") = 0 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Prepare certbot command
|
|
||||||
ln -s /snap/bin/certbot /usr/bin/certbot
|
|
||||||
|
|
||||||
#Generating Certificates
|
#Generating Certificates
|
||||||
certbot -q --nginx --register-unsafely-without-email --agree-tos certonly -d $serverdn >> $logfile 2>&1
|
certbot -q --nginx --register-unsafely-without-email --agree-tos certonly -d $serverdn >> $logfile 2>&1
|
||||||
|
|||||||
+3
-3
@@ -44,7 +44,7 @@ if [ "$fullrelno" = "17.10" ]; then
|
|||||||
rtdevrel=0
|
rtdevrel=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ([ "$osname" = "Debian" ] || [ "$osname" = "Raspbian" ] && [ $relno -ge 9 ]) || ([ "$osname" = "Ubuntu" ] && [ $relno -ge 18 ]); then
|
if ([ "$osname" = "Debian" ] || [ "$osname" = "Raspbian" ] && [ $relno -ge 9 ]) || ([ "$osname" = "Ubuntu" ] && [ $relno -ge 18 ]) || ([ "$osname" = "Linuxmint" ] && [ $relno -ge 18 ]); then
|
||||||
rtdevrel=0
|
rtdevrel=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -157,7 +157,7 @@ if [ -z $passed_rtvers ]; then
|
|||||||
|
|
||||||
# checks if the OS is debian 9, and forces the version to 0.9.7 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
|
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"
|
echo "For Debian 9, Ubuntu 17.10 or later and Linux Mint 17 or later, libtorrent-0.13.7/rtorrent-0.9.7 or later is recommended"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
list_version
|
list_version
|
||||||
@@ -184,7 +184,7 @@ else
|
|||||||
if [ $rtdevrel = 0 ]; then
|
if [ $rtdevrel = 0 ]; then
|
||||||
libvers='0.13.8'
|
libvers='0.13.8'
|
||||||
rtvers='0.9.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"
|
echo "Debian 9, Ubuntu 17.10 or later and Linux Mint 17 or later are only supported by libtorrent-0.13.7/rtorrent-0.9.7 or later"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user