Browse Source

Fix libmemcached

lj2007331@gmail.com 6 years ago
parent
commit
a1694189a3
3 changed files with 10 additions and 10 deletions
  1. 8 8
      backup.sh
  2. 1 1
      include/memcached.sh
  3. 1 1
      versions.txt

+ 8 - 8
backup.sh

@@ -110,9 +110,9 @@ WEB_OSS_BK() {
     [ ! -e "${wwwroot_dir}/$WebSite" ] && { echo "[${wwwroot_dir}/$WebSite] not exist"; break; }
     PUSH_FILE="${backup_dir}/Web_${W}_$(date +%Y%m%d_%H).tgz"
     if [ ! -e "${PUSH_FILE}" ]; then
-      pushd ${wwwroot_dir}
+      pushd ${wwwroot_dir} > /dev/null
       tar czf ${PUSH_FILE} ./$W
-      popd
+      popd > /dev/null
     fi
     /usr/local/bin/ossutil cp -f ${PUSH_FILE} oss://${oss_bucket}/`date +%F`/${PUSH_FILE##*/}
     [ $? -eq 0 ] && { [ -e "${PUSH_FILE}" ] && rm -rf ${PUSH_FILE}; /usr/local/bin/ossutil rm -rf oss://${oss_bucket}/`date +%F --date="${expired_days} days ago"`/; }
@@ -125,9 +125,9 @@ WEB_COS_BK() {
     [ ! -e "${wwwroot_dir}/$WebSite" ] && { echo "[${wwwroot_dir}/$WebSite] not exist"; break; }
     PUSH_FILE="${backup_dir}/Web_${W}_$(date +%Y%m%d_%H).tgz"
     if [ ! -e "${PUSH_FILE}" ]; then
-      pushd ${wwwroot_dir}
+      pushd ${wwwroot_dir} > /dev/null
       tar czf ${PUSH_FILE} ./$W
-      popd
+      popd > /dev/null
     fi
     ${python_install_dir}/bin/coscmd upload ${PUSH_FILE} /`date +%F`/${PUSH_FILE##*/}
     if [ $? -eq 0 ]; then
@@ -144,9 +144,9 @@ WEB_UPYUN_BK() {
     [ ! -e "${backup_dir}" ] && mkdir -p ${backup_dir}
     PUSH_FILE="${backup_dir}/Web_${W}_$(date +%Y%m%d_%H).tgz"
     if [ ! -e "${PUSH_FILE}" ]; then
-      pushd ${wwwroot_dir}
+      pushd ${wwwroot_dir} > /dev/null
       tar czf ${PUSH_FILE} ./$W
-      popd
+      popd > /dev/null
     fi
     /usr/local/bin/upx put ${PUSH_FILE} /`date +%F`/${PUSH_FILE##*/}
     if [ $? -eq 0 ]; then
@@ -163,9 +163,9 @@ WEB_QINIU_BK() {
     [ ! -e "${backup_dir}" ] && mkdir -p ${backup_dir}
     PUSH_FILE="${backup_dir}/Web_${W}_$(date +%Y%m%d_%H).tgz"
     if [ ! -e "${PUSH_FILE}" ]; then
-      pushd ${wwwroot_dir}
+      pushd ${wwwroot_dir} > /dev/null
       tar czf ${PUSH_FILE} ./$W
-      popd
+      popd > /dev/null
     fi
     /usr/local/bin/qshell rput ${qiniu_bucket} /`date +%F`/${PUSH_FILE##*/} ${PUSH_FILE} 
     if [ $? -eq 0 ]; then

+ 1 - 1
include/memcached.sh

@@ -77,8 +77,8 @@ Install_php-memcached() {
     phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
     # php memcached extension
     tar xzf libmemcached-${libmemcached_ver}.tar.gz
-    pushd libmemcached-${libmemcached_ver}
     patch -d libmemcached-${libmemcached_ver} -p0 < libmemcached-build.patch
+    pushd libmemcached-${libmemcached_ver}
     [ "${OS}" == "CentOS" ] && yum -y install cyrus-sasl-devel
     [[ "${OS}" =~ ^Ubuntu$|^Debian$ ]] && sed -i "s@lthread -pthread -pthreads@lthread -lpthread -pthreads@" ./configure
     ./configure --with-memcached=${memcached_install_dir}

+ 1 - 1
versions.txt

@@ -71,7 +71,7 @@ xcache_ver=3.2.0
 apcu_ver=4.0.11
 apcu_for_php7_ver=5.1.11
 eaccelerator_ver=0.9.6.1
-swoole_ver=4.0.0
+swoole_ver=4.0.2
 xdebug_ver=2.6.0
 
 # Ftp