Update mysql-5.*.sh

include/mysql-5.5.sh

@@ -17,7 +17,15 @@ else
     [ "$IPADDR_STATE"x == "CN"x ] && DOWN_ADDR_MYSQL=http://mirrors.sohu.com/mysql/MySQL-5.5 || DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.5
 fi
 
-src_url=$DOWN_ADDR_MYSQL/mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}.tar.gz && Download_src
+FILE_NAME=mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}.tar.gz
+src_url=$DOWN_ADDR_MYSQL/$FILE_NAME && Download_src
+src_url=$DOWN_ADDR_MYSQL/$FILE_NAME.md5 && Download_src
+MYSQL_TAR_MD5=`awk '{print $1}' $FILE_NAME.md5`
+while [ "`md5sum $FILE_NAME | awk '{print $1}'`" != "$MYSQL_TAR_MD5" ];
+do
+    wget -c --no-check-certificate $DOWN_ADDR_MYSQL/$FILE_NAME
+    [ "`md5sum $FILE_NAME | awk '{print $1}'`" == "$MYSQL_TAR_MD5" ] && break || continue
+done
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql

include/mysql-5.6.sh

@@ -17,7 +17,15 @@ else
     [ "$IPADDR_STATE"x == "CN"x ] && DOWN_ADDR_MYSQL=http://mirrors.sohu.com/mysql/MySQL-5.6 || DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.6
 fi
 
-src_url=$DOWN_ADDR_MYSQL/mysql-${mysql_5_6_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz && Download_src
+FILE_NAME=mysql-${mysql_5_6_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
+src_url=$DOWN_ADDR_MYSQL/$FILE_NAME && Download_src
+src_url=$DOWN_ADDR_MYSQL/$FILE_NAME.md5 && Download_src
+MYSQL_TAR_MD5=`awk '{print $1}' $FILE_NAME.md5`
+while [ "`md5sum $FILE_NAME | awk '{print $1}'`" != "$MYSQL_TAR_MD5" ];
+do
+    wget -c --no-check-certificate $DOWN_ADDR_MYSQL/$FILE_NAME
+    [ "`md5sum $FILE_NAME | awk '{print $1}'`" == "$MYSQL_TAR_MD5" ] && break || continue
+done
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql

include/mysql-5.7.sh

@@ -17,7 +17,15 @@ else
     [ "$IPADDR_STATE"x == "CN"x ] && DOWN_ADDR_MYSQL=http://mirrors.sohu.com/mysql/MySQL-5.7 || DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.7
 fi
 
-src_url=$DOWN_ADDR_MYSQL/mysql-${mysql_5_7_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz && Download_src
+FILE_NAME=mysql-${mysql_5_7_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
+src_url=$DOWN_ADDR_MYSQL/$FILE_NAME && Download_src
+src_url=$DOWN_ADDR_MYSQL/$FILE_NAME.md5 && Download_src
+MYSQL_TAR_MD5=`awk '{print $1}' $FILE_NAME.md5`
+while [ "`md5sum $FILE_NAME | awk '{print $1}'`" != "$MYSQL_TAR_MD5" ];
+do
+    wget -c --no-check-certificate $DOWN_ADDR_MYSQL/$FILE_NAME
+    [ "`md5sum $FILE_NAME | awk '{print $1}'`" == "$MYSQL_TAR_MD5" ] && break || continue
+done
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql

init.d/Tomcat-init

@@ -22,7 +22,7 @@ TOMCAT_USAGE="Usage: $0 {\e[00;32mstart\e[00m|\e[00;31mstop\e[00m|\e[00;32mstatu
 SHUTDOWN_WAIT=20
 
 tomcat_pid() {
-        echo `ps -ef | grep $CATALINA_HOME | grep -v grep | tr -s " "|cut -d" " -f2`
+        echo `ps -ef | grep $CATALINA_HOME/ | grep -v grep | tr -s " "|cut -d" " -f2`
 }
 
 start() {

versions.txt

@@ -20,8 +20,8 @@ mysql_5_7_version=5.7.13
 mysql_5_6_version=5.6.31
 mysql_5_5_version=5.5.50
 
-mariadb_10_1_version=10.1.14
-mariadb_10_0_version=10.0.25
+mariadb_10_1_version=10.1.15
+mariadb_10_0_version=10.0.26
 mariadb_5_5_version=5.5.50
 
 percona_5_7_version=5.7.12-5
@@ -43,7 +43,7 @@ php_3_version=5.3.29
 zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.10
-ImageMagick_version=6.9.4-9
+ImageMagick_version=6.9.4-10
 imagick_version=3.4.1
 GraphicsMagick_version=1.3.24
 gmagick_version=1.1.7RC3