Browse Source

Update versions.txt

lj2007331 8 years ago
parent
commit
093da16a02
3 changed files with 15 additions and 7 deletions
  1. 5 1
      addons.sh
  2. 4 0
      include/check_os.sh
  3. 6 6
      versions.txt

+ 5 - 1
addons.sh

@@ -129,7 +129,11 @@ EOF
   /bin/mv certbot-auto /usr/local/bin/
   chmod +x /usr/local/bin/certbot-auto
   certbot-auto -n
-  certbot-auto -h | grep '\-\-standalone' > /dev/null && echo; echo "${CSUCCESS}Let's Encrypt client installed successfully! ${CEND}"
+  if [ -e "/root/.local/share/letsencrypt/bin/letsencrypt" ] && certbot-auto -h | grep '\-\-standalone' > /dev/null ; then
+    echo; echo "${CSUCCESS}Let's Encrypt client installed successfully! ${CEND}"
+  else
+    echo; echo "${CSUCCESS}Let's Encrypt client install failed, Please install again! ${CEND}"
+  fi
 }
 
 Uninstall_letsencrypt() {

+ 4 - 0
include/check_os.sh

@@ -29,6 +29,10 @@ elif [ -n "$(grep Ubuntu /etc/issue)" -o "$(lsb_release -is 2>/dev/null)" == 'Ub
   [ ! -e "$(which lsb_release)" ] && { apt-get -y update; apt-get -y install lsb-release; clear; }
   Ubuntu_version=$(lsb_release -sr | awk -F. '{print $1}')
   [ -n "$(grep 'Linux Mint 18' /etc/issue)" ] && Ubuntu_version=16
+elif [ -n "$(grep elementary /etc/issue)" -o "$(lsb_release -is 2>/dev/null)" == 'elementary' ]; then
+  OS=Ubuntu
+  [ ! -e "$(which lsb_release)" ] && { apt-get -y update; apt-get -y install lsb-release; clear; }
+  Ubuntu_version=16
 else
   echo "${CFAILURE}Does not support this OS, Please contact the author! ${CEND}"
   kill -9 $$

+ 6 - 6
versions.txt

@@ -1,6 +1,6 @@
 # newest software version
 # Web
-nginx_version=1.10.1
+nginx_version=1.10.2
 tengine_version=2.1.1
 openresty_version=1.11.2.1
 openssl_version=1.0.2j
@@ -22,10 +22,10 @@ mysql_5_5_version=5.5.53
 
 mariadb_10_1_version=10.1.18
 mariadb_10_0_version=10.0.27
-mariadb_5_5_version=5.5.52
+mariadb_5_5_version=5.5.53
 
-percona_5_7_version=5.7.14-8
-percona_5_6_version=5.6.32-78.1
+percona_5_7_version=5.7.15-9
+percona_5_6_version=5.6.33-79.0
 percona_5_5_version=5.5.52-38.3
 
 # JDK
@@ -34,8 +34,8 @@ jdk_7_version=1.7.0_80
 jdk_6_version=1.6.0_45
 
 # PHP
-php_7_version=7.0.11
-php_6_version=5.6.26
+php_7_version=7.0.12
+php_6_version=5.6.27
 php_5_version=5.5.38
 php_4_version=5.4.45
 php_3_version=5.3.29