Merge pull request #1254 from paddatrapper/chore/remove-bionic
Drop Ubuntu Xenial support
This commit is contained in:
commit
d58fe19ae3
9 changed files with 58 additions and 233 deletions
21
install
21
install
|
@ -146,8 +146,7 @@ function systemInitDetect() {
|
|||
verbose "\nDetecting init system type ..."
|
||||
# Get the path of the command where pid=1 following any symlinks
|
||||
pid_1_path=$(readlink --canonicalize -n /proc/1/exe)
|
||||
# returns '/sbin/init' (Debian Wheezy & Ubuntu Trusty)
|
||||
# returns '(/usr)?/lib/systemd/systemd' (Debian Stretch, Debian Jessie, Debian Buster, Ubuntu Xenial, CentOS 7)
|
||||
# returns '(/usr)?/lib/systemd/systemd' (Debian Buster, CentOS 7)
|
||||
verbose "Detected path to PID=1 process: $pid_1_path"
|
||||
# Get package of PID=1 path as it identifies the init system.
|
||||
# Allow this to fail, at least then the init system can be guessed from the
|
||||
|
@ -625,7 +624,6 @@ is_debian_dist=false
|
|||
is_debian_buster=false
|
||||
is_ubuntu_dist=false
|
||||
is_ubuntu_bionic=false
|
||||
is_ubuntu_xenial=false
|
||||
is_centos_dist=false
|
||||
is_centos_7=false
|
||||
is_centos_8=false
|
||||
|
@ -641,13 +639,8 @@ case "${dist}-${code}" in
|
|||
is_ubuntu_bionic=true
|
||||
;;
|
||||
ubuntu-16.04|ubuntu-xenial|ubuntu-xenial_docker_minimal)
|
||||
code="xenial"
|
||||
is_ubuntu_dist=true
|
||||
is_ubuntu_xenial=true
|
||||
;;
|
||||
ubuntu-14.04|ubuntu-trusty)
|
||||
echo -e "ERROR: Ubuntu Trusty is archived and does not receive any security or other updates since 2019-04-17." >&2
|
||||
echo -e "The LibreTime installer dropped support for installing LibreTime on Trusty in 3.0.0-alpha.8." >&2
|
||||
echo -e "ERROR: Ubuntu Xenial is archived and does not receive any security or other updates since 2021-04-01." >&2
|
||||
echo -e "The LibreTime installer dropped support for installing LibreTime on Xenial in 3.0.0-alpha.10." >&2
|
||||
exit 1
|
||||
;;
|
||||
debian-9|debian-stretch)
|
||||
|
@ -730,11 +723,6 @@ if [ "$ignore_dependencies" = "f" ]; then
|
|||
# Get apt-get version by returning the 2nd parameter from the 1st line of output
|
||||
apt_version=$(apt-get --version |awk 'NR == 1 { print $2 }')
|
||||
# returns 1.8.0~alpha3 (Debian Buster)
|
||||
# returns: 1.4.7 (Debian Stretch)
|
||||
# returns: 0.9.7.9 (Debian Wheezy)
|
||||
# returns: 1.0.1ubuntu2 (Ubuntu Trusty)
|
||||
# returns: 1.0.9.8.4 (Debian Jessie)
|
||||
# returns: 1.2.9 (Ubuntu Xenial)
|
||||
verbose "Detected apt-get version as: $apt_version"
|
||||
apt_version_formatted=$(awk 'BEGIN {FS = "."} {printf "%03d.%03d\n", $1,$2}' <<< $apt_version)
|
||||
[[ "$apt_version_formatted" < "001.001" ]] && apt_force_options="--force-yes"
|
||||
|
@ -1079,8 +1067,6 @@ if $is_debian_buster; then
|
|||
loudCmd "a2enmod rewrite php7.3 proxy proxy_http"
|
||||
elif $is_ubuntu_bionic; then
|
||||
loudCmd "a2enmod rewrite php7.2 proxy proxy_http"
|
||||
elif $is_ubuntu_xenial; then
|
||||
loudCmd "a2enmod rewrite php7.0 proxy proxy_http"
|
||||
elif $is_centos_dist; then
|
||||
verbose "TODO: enable Apache modules mod_rewrite, mod_php, mod_proxy and mod_proxy_http manually"
|
||||
else
|
||||
|
@ -1230,7 +1216,6 @@ if $is_centos_dist; then
|
|||
else
|
||||
# not on centos
|
||||
ip_device="eth0"
|
||||
$is_ubuntu_xenial && ip_device="enp0s8"
|
||||
IP=$(ifconfig ${ip_device} 2>/dev/null |awk -F'[ :]+' '/inet addr:/ {print $4}')
|
||||
fi
|
||||
verbose "...Done"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue