Browse Source

rename ld.so.conf.d/*.conf and Update pecl_memcached ver

lj2007331@gmail.com 6 years ago
parent
commit
35f3412a22

+ 1 - 1
include/alisql-5.6.sh

@@ -204,7 +204,7 @@ EOF
   ${alisql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
   [ -e "${alisql_install_dir}/my.cnf" ] && rm -rf ${alisql_install_dir}/my.cnf
-  echo "${alisql_install_dir}/lib" > /etc/ld.so.conf.d/alisql.conf
+  echo "${alisql_install_dir}/lib" > /etc/ld.so.conf.d/z-alisql.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/check_download.sh

@@ -789,7 +789,7 @@ checkDownload() {
       # src_url=https://codeload.github.com/websupport-sk/pecl-memcache/zip/php7 && Download_src
       src_url=${mirrorLink}/pecl-memcache-php7.tgz && Download_src
       echo "Download pecl_memcached for php 7.x..."
-      src_url=${mirrorLink}/memcached-${pecl_memcached_php7_ver}.tgz && Download_src
+      src_url=https://pecl.php.net/get/memcached-${pecl_memcached_php7_ver}.tgz && Download_src
     fi
 
     echo "Download libmemcached..."

+ 1 - 1
include/mariadb-10.0.sh

@@ -208,7 +208,7 @@ EOF
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
-  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/mariadb.conf
+  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/z-mariadb.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/mariadb-10.1.sh

@@ -212,7 +212,7 @@ EOF
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
-  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/mariadb.conf
+  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/z-mariadb.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/mariadb-10.2.sh

@@ -212,7 +212,7 @@ EOF
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
-  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/mariadb.conf
+  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/z-mariadb.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/mariadb-10.3.sh

@@ -212,7 +212,7 @@ EOF
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
-  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/mariadb.conf
+  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/z-mariadb.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/mariadb-5.5.sh

@@ -211,7 +211,7 @@ EOF
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
-  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/mariadb.conf
+  echo "${mariadb_install_dir}/lib" > /etc/ld.so.conf.d/z-mariadb.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/mysql-5.5.sh

@@ -215,7 +215,7 @@ EOF
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
   [ -e "${mysql_install_dir}/my.cnf" ] && rm -f ${mysql_install_dir}/my.cnf
-  echo "${mysql_install_dir}/lib" > /etc/ld.so.conf.d/mysql.conf
+  echo "${mysql_install_dir}/lib" > /etc/ld.so.conf.d/z-mysql.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/mysql-5.6.sh

@@ -214,7 +214,7 @@ EOF
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
   [ -e "${mysql_install_dir}/my.cnf" ] && rm -f ${mysql_install_dir}/my.cnf
-  echo "${mysql_install_dir}/lib" > /etc/ld.so.conf.d/mysql.conf
+  echo "${mysql_install_dir}/lib" > /etc/ld.so.conf.d/z-mysql.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/mysql-5.7.sh

@@ -215,7 +215,7 @@ EOF
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
   [ -e "${mysql_install_dir}/my.cnf" ] && rm -f ${mysql_install_dir}/my.cnf
-  echo "${mysql_install_dir}/lib" > /etc/ld.so.conf.d/mysql.conf
+  echo "${mysql_install_dir}/lib" > /etc/ld.so.conf.d/z-mysql.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/mysql-8.0.sh

@@ -210,7 +210,7 @@ EOF
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
   [ -e "${mysql_install_dir}/my.cnf" ] && rm -f ${mysql_install_dir}/my.cnf
-  echo "${mysql_install_dir}/lib" > /etc/ld.so.conf.d/mysql.conf
+  echo "${mysql_install_dir}/lib" > /etc/ld.so.conf.d/z-mysql.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/percona-5.5.sh

@@ -215,7 +215,7 @@ EOF
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
-  echo "${percona_install_dir}/lib" > /etc/ld.so.conf.d/percona.conf
+  echo "${percona_install_dir}/lib" > /etc/ld.so.conf.d/z-percona.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/percona-5.6.sh

@@ -215,7 +215,7 @@ EOF
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
-  echo "${percona_install_dir}/lib" > /etc/ld.so.conf.d/percona.conf
+  echo "${percona_install_dir}/lib" > /etc/ld.so.conf.d/z-percona.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 1
include/percona-5.7.sh

@@ -216,7 +216,7 @@ EOF
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "reset master;"
   rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
   [ -e "${percona_install_dir}/my.cnf" ] && rm -rf ${percona_install_dir}/my.cnf
-  echo "${percona_install_dir}/lib" > /etc/ld.so.conf.d/mysql.conf
+  echo "${percona_install_dir}/lib" > /etc/ld.so.conf.d/z-percona.conf
   ldconfig
   service mysqld stop
 }

+ 1 - 2
uninstall.sh

@@ -172,7 +172,6 @@ Print_MySQL() {
   [ -e "${db_install_dir}" ] && echo "${db_install_dir}"
   [ -e "/etc/init.d/mysqld" ] && echo "/etc/init.d/mysqld"
   [ -e "/etc/my.cnf" ] && echo "/etc/my.cnf"
-  [ -e "/etc/my.cnf.d" ] && echo "/etc/my.cnf.d"
 }
 
 Print_PostgreSQL() {
@@ -192,7 +191,7 @@ Uninstall_MySQL() {
   # uninstall mysql,mariadb,percona,alisql
   if [ -d "${db_install_dir}/support-files" ]; then
     service mysqld stop > /dev/null 2>&1
-    rm -rf ${db_install_dir} /etc/init.d/mysqld /etc/my.cnf* /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
+    rm -rf ${db_install_dir} /etc/init.d/mysqld /etc/my.cnf* /etc/ld.so.conf.d/*{mysql,mariadb,percona,alisql}*.conf
     id -u mysql >/dev/null 2>&1 ; [ $? -eq 0 ] && userdel mysql
     [ -e "${db_data_dir}" ] && /bin/mv ${db_data_dir}{,$(date +%Y%m%d%H)}
     sed -i 's@^dbrootpwd=.*@dbrootpwd=@' ./options.conf

+ 1 - 1
versions.txt

@@ -88,7 +88,7 @@ pecl_redis_ver=4.2.0
 memcached_ver=1.5.12
 libmemcached_ver=1.0.18
 pecl_memcached_ver=2.2.0
-pecl_memcached_php7_ver=3.1.0
+pecl_memcached_php7_ver=3.1.2
 pecl_memcache_ver=3.0.8
 
 # MongoDB