diff --git a/ols1clk.sh b/ols1clk.sh index 1d2cefd7..1a26d2b3 100755 --- a/ols1clk.sh +++ b/ols1clk.sh @@ -70,12 +70,12 @@ EMAIL= #All lsphp versions, keep using two digits to identify a version!!! #otherwise, need to update the uninstall function which will check the version LSPHPVERLIST=(54 55 56 70 71 72) -MARIADBVERLIST=(10.0 10.1 10.2) +MARIADBVERLIST=(10.0 10.1 10.2 10.3) #default version LSPHPVER=56 USEDEFAULTLSPHP=1 -MARIADBVER=10.2 +MARIADBVER=10.3 USEDEFAULTLSMARIADB=1 ALLERRORS=0 @@ -138,8 +138,8 @@ function check_wget function display_license { echoY '**********************************************************************************************' - echoY '* Open LiteSpeed One click installation, Version 1.7 *' - echoY '* Copyright (C) 2016 - 2017 LiteSpeed Technologies, Inc. *' + echoY '* Open LiteSpeed One click installation, Version 1.8 *' + echoY '* Copyright (C) 2016 - 2018 LiteSpeed Technologies, Inc. *' echoY '**********************************************************************************************' } @@ -151,52 +151,45 @@ function check_os MARIADBCPUARCH= if [ -f /etc/redhat-release ] ; then - cat /etc/redhat-release | grep " 5." >/dev/null + cat /etc/redhat-release | grep " 6." >/dev/null if [ $? = 0 ] ; then - OSNAMEVER=CENTOS5 + OSNAMEVER=CENTOS6 OSNAME=centos - OSVER=5 + OSVER=6 else - cat /etc/redhat-release | grep " 6." >/dev/null + cat /etc/redhat-release | grep " 7." >/dev/null if [ $? = 0 ] ; then - OSNAMEVER=CENTOS6 + OSNAMEVER=CENTOS7 OSNAME=centos - OSVER=6 - else - cat /etc/redhat-release | grep " 7." >/dev/null - if [ $? = 0 ] ; then - OSNAMEVER=CENTOS7 - OSNAME=centos - OSVER=7 + OSVER=7 - fi fi fi elif [ -f /etc/lsb-release ] ; then - cat /etc/lsb-release | grep "DISTRIB_RELEASE=12." >/dev/null + cat /etc/lsb-release | grep "DISTRIB_RELEASE=14." >/dev/null if [ $? = 0 ] ; then - OSNAMEVER=UBUNTU12 + OSNAMEVER=UBUNTU14 OSNAME=ubuntu - OSVER=precise - MARIADBCPUARCH="arch=amd64,i386" - + OSVER=trusty + MARIADBCPUARCH="arch=amd64,i386,ppc64el" else - cat /etc/lsb-release | grep "DISTRIB_RELEASE=14." >/dev/null + cat /etc/lsb-release | grep "DISTRIB_RELEASE=16." >/dev/null if [ $? = 0 ] ; then - OSNAMEVER=UBUNTU14 + OSNAMEVER=UBUNTU16 OSNAME=ubuntu - OSVER=trusty + OSVER=xenial MARIADBCPUARCH="arch=amd64,i386,ppc64el" + else - cat /etc/lsb-release | grep "DISTRIB_RELEASE=16." >/dev/null + cat /etc/lsb-release | grep "DISTRIB_RELEASE=18." >/dev/null if [ $? = 0 ] ; then - OSNAMEVER=UBUNTU16 + OSNAMEVER=UBUNTU18 OSNAME=ubuntu - OSVER=xenial - MARIADBCPUARCH="arch=amd64,i386,ppc64el" + OSVER=bionic + MARIADBCPUARCH="arch=amd64" fi fi - fi + fi elif [ -f /etc/debian_version ] ; then cat /etc/debian_version | grep "^7." >/dev/null if [ $? = 0 ] ; then @@ -224,7 +217,7 @@ function check_os fi if [ "x$OSNAMEVER" = "x" ] ; then - echoR "Sorry, currently one click installation only supports Centos(5-7), Debian(7-9) and Ubuntu(12,14,16)." + echoR "Sorry, currently one click installation only supports Centos(6,7), Debian(7-9) and Ubuntu(14,16,18)." echoR "You can download the source code and build from it." echoR "The url of the source code is https://github.com/litespeedtech/openlitespeed/releases." echo @@ -550,6 +543,9 @@ END elif [ "x$OSNAMEVER" = "xUBUNTU16" ] ; then apt-get install software-properties-common apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 + elif [ "x$OSNAMEVER" = "xUBUNTU18" ] ; then + apt-get install software-properties-common + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 fi grep -Fq "http://mirror.jaleco.com/mariadb/repo/" /etc/apt/sources.list.d/mariadb_repo.list @@ -781,7 +777,6 @@ map wordpress $SITEDOMAIN module cache { -param <<