Fix Percona install

include/check_download.sh

@@ -679,13 +679,13 @@ checkDownload() {
       echo "Download pecl memcache for php 7.x..."
       # 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 php-memcached for php 7.x..."
-      src_url=${mirrorLink}/php-memcached-php7.tgz && Download_src
+      echo "Download pecl memcached for php 7.x..."
+      src_url=https://pecl.php.net/get/memcached-${memcached_pecl_php7_version}.tgz && Download_src
     else
       echo "Download pecl memcache for php..."
       src_url=http://pecl.php.net/get/memcache-${memcache_pecl_version}.tgz && Download_src
-      echo "Download php-memcached for php..."
-    src_url=http://pecl.php.net/get/memcached-${memcached_pecl_version}.tgz && Download_src
+      echo "Download pecl memcached for php..."
+      src_url=http://pecl.php.net/get/memcached-${memcached_pecl_version}.tgz && Download_src
     fi
 
     echo "Download libmemcached..."

include/mariadb-10.0.sh

@@ -21,6 +21,7 @@ Install_MariaDB100() {
     tar zxf mariadb-${mariadb100_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
     mv mariadb-${mariadb100_version}-*-${SYS_BIT_b}/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf mariadb-${mariadb100_version}.tar.gz
     pushd mariadb-${mariadb100_version}

include/mariadb-10.1.sh

@@ -21,6 +21,7 @@ Install_MariaDB101() {
     tar zxf mariadb-${mariadb101_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
     mv mariadb-${mariadb101_version}-*-${SYS_BIT_b}/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf mariadb-${mariadb101_version}.tar.gz
     pushd mariadb-${mariadb101_version}

include/mariadb-5.5.sh

@@ -21,6 +21,7 @@ Install_MariaDB55() {
     tar zxf mariadb-${mariadb55_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
     mv mariadb-${mariadb55_version}-*-${SYS_BIT_b}/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf mariadb-${mariadb55_version}.tar.gz
     pushd mariadb-${mariadb55_version}

include/memcached.sh

@@ -85,10 +85,8 @@ Install_php-memcached() {
     rm -rf libmemcached-${libmemcached_version}
 
     if [ "$(${php_install_dir}/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}')" == '7' ]; then
-      #git clone -b php7 https://github.com/php-memcached-dev/php-memcached.git
-      #cd php-memcached
-      tar xzf php-memcached-php7.tgz
-      pushd php-memcached-php7
+      tar xzf memcached-${memcached_pecl_php7_version}.tgz 
+      pushd memcached-${memcached_pecl_php7_version} 
     else
       tar xzf memcached-${memcached_pecl_version}.tgz
       pushd memcached-${memcached_pecl_version}
@@ -98,12 +96,12 @@ Install_php-memcached() {
     make -j ${THREAD} && make install
     popd
     if [ -f "${phpExtensionDir}/memcached.so" ]; then
-        cat > ${php_install_dir}/etc/php.d/ext-memcached.ini << EOF
+      cat > ${php_install_dir}/etc/php.d/ext-memcached.ini << EOF
 extension=memcached.so
 memcached.use_sasl=1
 EOF
       echo "${CSUCCESS}PHP memcached module installed successfully! ${CEND}"
-      rm -rf php-memcached-php7 memcached-${memcached_pecl_version}
+      rm -rf memcached-${memcached_pecl_version} memcached-${memcached_pecl_php7_version}
     else
       echo "${CFAILURE}PHP memcached module install failed, Please contact the author! ${CEND}"
     fi

include/percona-5.5.sh

@@ -22,6 +22,7 @@ Install_Percona55() {
     tar xvf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/Percona-Server-${percona56_version}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf percona-server-${percona55_version}.tar.gz
     pushd percona-server-${percona55_version}

include/percona-5.6.sh

@@ -22,6 +22,7 @@ Install_Percona56() {
     tar xvf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/Percona-Server-${percona56_version}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf percona-server-${percona56_version}.tar.gz
     pushd percona-server-${percona56_version}

include/percona-5.7.sh

@@ -21,6 +21,7 @@ Install_Percona57() {
     tar xvf Percona-Server-${percona57_version}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${percona57_version}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/Percona-Server-${percona57_version}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf percona-server-${percona57_version}.tar.gz
     pushd percona-server-${percona57_version}

versions.txt

@@ -22,7 +22,7 @@ mysql56_version=5.6.35
 mysql55_version=5.5.54
 
 mariadb101_version=10.1.21
-mariadb100_version=10.0.29
+mariadb100_version=10.0.30
 mariadb55_version=5.5.54
 
 percona57_version=5.7.17-11
@@ -73,6 +73,7 @@ redis_pecl_version=2.2.8
 memcached_version=1.4.35
 libmemcached_version=1.0.18
 memcached_pecl_version=2.2.0
+memcached_pecl_php7_version=3.0.3
 memcache_pecl_version=3.0.8
 
 # phpMyadmin