rework & fix ngx_pagespeed download routine

separately check for pagespeed PSOL library existence instead of relying on only checking for existence of ngx_pagespeed tarball download and directory
centminmod · Jan 26, 2016 · 6038d53 · 6038d53
1 parent 348100d
commit 6038d53
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 16 deletions.
diff --git a/inc/downloads.inc b/inc/downloads.inc
@@ -271,26 +271,25 @@ if [[ "$NGINX_PAGESPEEDGITMASTER" = [yY] ]]; then
 	rm -rf ${NGX_PAGESPEEDGITLINKFILE}
 fi
 
-        cecho "Download ${NGX_PAGESPEEDPSOLINKLFILE} ..." $boldyellow
-    if [ -s ${NGX_PAGESPEEDPSOLINKLFILE} ]; then
-        cecho "${NGX_PAGESPEEDPSOLINKLFILE} Archive found, skipping download..." $boldgreen
-    else
+        cecho "Download ${NGX_PAGESPEEDPSOLINKLFILE} PSOL Library..." $boldyellow
         if [ -d "$DIR_TMP/ngx_pagespeed-release-${NGXPGSPEED_VER}" ]; then
             cd $DIR_TMP/ngx_pagespeed-release-${NGXPGSPEED_VER}
         elif [ -d "$DIR_TMP/ngx_pagespeed-${NGXPGSPEED_VER}" ]; then
             cd $DIR_TMP/ngx_pagespeed-${NGXPGSPEED_VER}
         fi
-        wget -c --progress=bar --no-check-certificate ${NGX_PAGESPEEDPSOLINKL} --tries=3 
-ERROR=$?
-	if [[ "$ERROR" != '0' ]]; then
-	cecho "Error: ${NGX_PAGESPEEDPSOLINKLFILE} download failed." $boldgreen
-checklogdetails
-	exit #$ERROR
-else 
-         cecho "Download done." $boldyellow
-#echo ""
-	fi
-    fi
+        if [ -s ${NGX_PAGESPEEDPSOLINKLFILE} ]; then
+          cecho "${NGX_PAGESPEEDPSOLINKLFILE} Archive found, skipping download..." $boldgreen
+        else
+          wget -c --progress=bar --no-check-certificate ${NGX_PAGESPEEDPSOLINKL} --tries=3 
+          ERROR=$?
+	        if [[ "$ERROR" != '0' ]]; then
+	          cecho "Error: ${NGX_PAGESPEEDPSOLINKLFILE} download failed." $boldgreen
+            checklogdetails
+	          exit #$ERROR
+          else 
+            cecho "Download done." $boldyellow
+        	fi
+        fi
 
 tar xzf ${NGX_PAGESPEEDPSOLINKLFILE}
 ERROR=$?

diff --git a/inc/nginx_upgrade.inc b/inc/nginx_upgrade.inc
@@ -153,7 +153,7 @@ if [[ -d "${DIR_TMP}/ngx_pagespeed-release-${NGXPGSPEED_VER}/ngx_pagespeed-maste
 fi
 
 cecho "Check for missing nginx modules" $boldyellow
-if [[ ! -f "${DIR_TMP}/${NGX_FANCYINDEXLINKFILE}" || ! -f "${DIR_TMP}/${NGX_CACHEPURGEFILE}" || ! -f "${DIR_TMP}/${NGX_ACCESSKEYLINKFILE}" || ! -f "${DIR_TMP}/${NGX_CONCATLINKFILE}" || ! -f "${DIR_TMP}/${OPENSSL_LINKFILE}" || ! -f "${DIR_TMP}/${LIBRESSL_LINKFILE}" || ! -f "${DIR_TMP}/${PCRELINKFILE}" || ! -f "${DIR_TMP}/${NGX_WEBDAVLINKFILE}" || ! -d "${DIR_TMP}/${NGX_PAGESPEEDGITLINKFILE}" || ! -f "${DIR_TMP}/${NGX_HEADERSMORELINKFILE}" || ! -f "${DIR_TMP}/${NGX_STICKYLINKFILE}" || ! -f "${DIR_TMP}/${NGX_UPSTREAMCHECKLINKFILE}" || ! -f "${DIR_TMP}/${NGX_HTTPREDISLINKFILE}" ]]; then
+if [[ ! -f "${DIR_TMP}/${NGX_FANCYINDEXLINKFILE}" || ! -f "${DIR_TMP}/${NGX_CACHEPURGEFILE}" || ! -f "${DIR_TMP}/${NGX_ACCESSKEYLINKFILE}" || ! -f "${DIR_TMP}/${NGX_CONCATLINKFILE}" || ! -f "${DIR_TMP}/${OPENSSL_LINKFILE}" || ! -f "${DIR_TMP}/${LIBRESSL_LINKFILE}" || ! -f "${DIR_TMP}/${PCRELINKFILE}" || ! -f "${DIR_TMP}/${NGX_WEBDAVLINKFILE}" || ! -f "${DIR_TMP}/${NGX_HEADERSMORELINKFILE}" || ! -f "${DIR_TMP}/${NGX_STICKYLINKFILE}" || ! -f "${DIR_TMP}/${NGX_UPSTREAMCHECKLINKFILE}" || ! -f "${DIR_TMP}/${NGX_HTTPREDISLINKFILE}" ]]; then
 
     if [[ "$PARALLEL_MODE" = [yY] ]] && [[ "$(grep "processor" /proc/cpuinfo |wc -l)" -gt '1' ]]; then
         ngxmoduletarball &
@@ -167,6 +167,22 @@ if [[ ! -f "${DIR_TMP}/${NGX_FANCYINDEXLINKFILE}" || ! -f "${DIR_TMP}/${NGX_CACH
     fi
 fi
 
+cecho "Check for pagespeed nginx module download file" $boldyellow
+if [[ ! -f "${DIR_TMP}/${NGX_PAGESPEEDGITLINKFILE}" || ! -d "$DIR_TMP/ngx_pagespeed-${NGXPGSPEED_VER}" ]]; then
+        nginxpgspeedtarball
+fi
+
+cecho "Check for pagespeed PSOL library" $boldyellow
+if [ -d "$DIR_TMP/ngx_pagespeed-release-${NGXPGSPEED_VER}" ]; then
+    if [[ ! -f "${DIR_TMP}/ngx_pagespeed-release-${NGXPGSPEED_VER}/${NGX_PAGESPEEDPSOLINKLFILE}" ]]; then
+        nginxpgspeedtarball
+    fi
+elif [ -d "$DIR_TMP/ngx_pagespeed-${NGXPGSPEED_VER}" ]; then
+    if [[ ! -f "${DIR_TMP}/ngx_pagespeed-${NGXPGSPEED_VER}/${NGX_PAGESPEEDPSOLINKLFILE}" ]]; then
+        nginxpgspeedtarball
+    fi
+fi
+
 if [[ "$NGINX_OPENRESTY" = [yY] ]]; then
     if [[ ! -f "${DIR_TMP}/${NGX_MEMCLINKFILE}" || ! -f "${DIR_TMP}/${NGX_SRCACHELINKFILE}"|| ! -f "${DIR_TMP}/${NGX_REDISLINKFILE}" || ! -f "${DIR_TMP}/${NGX_ECHOLINKFILE}" || ! -f "${DIR_TMP}/${NGX_SETMISCLINKFILE}" || ! -f "${DIR_TMP}/${NGX_DEVELKITLINKFILE}" ]]; then
     openrestytarball