Updated memcached server & memcached/memcache php extension fallback …

…routines for 123.09beta01
centminmod · Jun 22, 2016 · 7edaf87 · 7edaf87
1 parent dfe0432
commit 7edaf87
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/inc/downloadlinks.inc b/inc/downloadlinks.inc
@@ -363,7 +363,7 @@ TWEMPERF_LINKGITLAB="https://gitlab.com/centminmod-github-mirror/twemperf/reposi
 
 MEMCACHEDSERVER_LINKFILE="memcached-${MEMCACHED_VERSION}.tar.gz"
 MEMCACHEDSERVER_LINK="http://www.memcached.org/files/${MEMCACHEDSERVER_LINKFILE}"
-#MEMCACHEDSERVER_LINK="https://centminmod.com/centminmodparts/memcached/${MEMCACHEDSERVER_LINKFILE}"
+MEMCACHEDSERVER_LINKLOCAL="https://centminmod.com/centminmodparts/memcached/${MEMCACHEDSERVER_LINKFILE}"
 
 MYSQLREPORT_LINKFILE="mysqlreport"
 MYSQLREPORT_LINK="https://centminmod.com/centminmodparts/mysqlreport/${MYSQLREPORT_LINKFILE}"

diff --git a/inc/downloads.inc b/inc/downloads.inc
@@ -2476,6 +2476,7 @@ echo ""
 
 ###############################################
 memcachetarball() {
+  MEMCACHED_ALT="$1"
 
 echo ""
 	if [ "$UNATTENDED" == 'n' ]; then
@@ -2504,8 +2505,11 @@ if [ -s "${MEMCACHEDSERVER_LINKFILE}" ]; then
   cecho "${MEMCACHEDSERVER_LINKFILE} found, skipping download..." $boldgreen
   else
   echo "Error: ${MEMCACHEDSERVER_LINKFILE} not found !!! Downloading now......"
-  		wget ${WGETOPT} --progress=bar "${MEMCACHEDSERVER_LINK}" --tries=3
-        # wget ${WGETOPT} --progress=bar http://memcached.googlecode.com/files/${MEMCACHEDSERVER_LINKFILE} --tries=3
+  if [[ "$MEMCACHED_ALT" != 'local' ]]; then
+    wget ${WGETOPT} --progress=bar "${MEMCACHEDSERVER_LINK}" --tries=3
+  else
+    wget ${WGETOPT} --progress=bar "${MEMCACHEDSERVER_LINKLOCAL}" --tries=3
+  fi
 ERROR=$?
 	if [[ "$ERROR" != '0' ]]; then
 	cecho "Error: ${MEMCACHEDSERVER_LINKFILE} download failed." $boldgreen

diff --git a/inc/memcached_install.inc b/inc/memcached_install.inc
@@ -210,7 +210,7 @@ else
     #tar xzf memcached-${MEMCACHED_VERSION}.tar.gz
     if [ ! -d "${DIR_TMP}/memcached-${MEMCACHED_VERSION}" ]; then
         rm -rf "${DIR_TMP}/memcached-${MEMCACHED_VERSION}*"
-        memcachetarball
+        memcachetarball local
     fi
     cd "${DIR_TMP}/memcached-${MEMCACHED_VERSION}"
     if [[ "$INITIALINSTALL" != [yY] ]]; then
@@ -273,7 +273,7 @@ if [ "$PHP_MEMCACHE" == 'y' ]; then
         #tar -xvf memcache-${MEMCACHE_VERSION}.tgz
         if [ ! -d "${DIR_TMP}/memcache-${MEMCACHE_VERSION}" ]; then
             rm -rf "${DIR_TMP}/memcache-${MEMCACHE_VERSION}*"
-            memcachedphptarball
+            memcacheextlocaltarball
         fi
         cd "${DIR_TMP}/memcache-${MEMCACHE_VERSION}"
         if [[ "$INITIALINSTALL" != [yY] ]]; then
@@ -327,7 +327,7 @@ else
     #tar xvzf libmemcached-${LIBMEMCACHED_VER}.tar.gz
     if [ ! -d "${DIR_TMP}/libmemcached-${LIBMEMCACHED_VER}" ]; then
         rm -rf "${DIR_TMP}/libmemcached-${LIBMEMCACHED_VER}*"
-        libmemcachedtarball
+        libmemcachedlocaltarball
     fi
     cd "${DIR_TMP}/libmemcached-${LIBMEMCACHED_VER}"
     if [[ "$INITIALINSTALL" != [yY] ]]; then
@@ -382,7 +382,7 @@ else
     echo "compiling memcached PHP extension ${MEMCACHEDPHP_VER} ..."
     if [ ! -d "${DIR_TMP}/memcached-${MEMCACHEDPHP_VER}" ]; then
         rm -rf "${DIR_TMP}/memcached-${MEMCACHEDPHP_VER}*"
-        memcachedphptarball
+        memcachedphplocaltarball
     fi
     cd "${DIR_TMP}/memcached-${MEMCACHEDPHP_VER}"
     if [[ "$INITIALINSTALL" != [yY] ]]; then