Improve Multi-PHP detection

Author: Kristan Kenney

bin/v-update-web-templates

@@ -40,22 +40,24 @@ fi
 # Update templates
 cp -rf $HESTIA/install/$type/templates/web $HESTIA/data/templates/
 
-# Update Multiphp templates
-php_versions=$(ls /etc/php/*/fpm -d | wc -l)
-if [ "$php_versions" -gt 1 ]; then
-    if [ "$WEB_SYSTEM" = "nginx" ]; then
-        for tplname in $(ls $HESTIA/data/templates/web/$WEB_SYSTEM/ | grep -v 'default'); do
-            rm -fr $HESTIA/data/templates/web/$WEB_SYSTEM/$tplname
+# Update Multi-PHP templates
+if [ -d "/etc/php/*/fpm" ]; then
+    php_versions=$(ls /etc/php/*/fpm -d | wc -l)
+    if [ "$php_versions" -gt 1 ]; then
+        if [ "$WEB_SYSTEM" = "nginx" ]; then
+            for tplname in $(ls $HESTIA/data/templates/web/$WEB_SYSTEM/ | grep -v 'default'); do
+                rm -fr $HESTIA/data/templates/web/$WEB_SYSTEM/$tplname
+            done
+        fi
+        for v in $(ls /etc/php/); do
+            if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
+                continue
+            fi
+            v_tpl=$(echo "$v" | sed -e 's/[.]//')
+            cp -f $HESTIA/install/$type/multiphp/$WEB_SYSTEM/PHP-$v_tpl.* $HESTIA/data/templates/web/$WEB_SYSTEM/
         done
+        chmod a+x $HESTIA/data/templates/web/$WEB_SYSTEM/*.sh
     fi
-    for v in $(ls /etc/php/); do
-        if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
-            continue
-        fi
-        v_tpl=$(echo "$v" | sed -e 's/[.]//')
-        cp -f $HESTIA/install/$type/multiphp/$WEB_SYSTEM/PHP-$v_tpl.* $HESTIA/data/templates/web/$WEB_SYSTEM/
-    done
-    chmod a+x $HESTIA/data/templates/web/$WEB_SYSTEM/*.sh
 fi
 
 # Rebuilding web domains

install/upgrade/0.10.0-190430.sh

@@ -174,16 +174,19 @@ if [ "$PROXY_SYSTEM" = "nginx" ]; then
 fi
 
 # Fix empty pool error message for MultiPHP
-php_versions=$(ls /etc/php/*/fpm -d | wc -l)
-if [ "$php_versions" -gt 1 ]; then
-    for v in $(ls /etc/php/); do
-        if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
-            continue
-        fi
-        cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$v/fpm/pool.d/
-        v1=$(echo "$v" | sed -e 's/[.]//')
-        sed -i "s/9999/99$v1/g" /etc/php/$v/fpm/pool.d/dummy.conf
-    done
+if [ -d "/etc/php/*/fpm" ]; then
+    php_versions=$(ls /etc/php/*/fpm -d | wc -l)
+    if [ "$php_versions" -gt 1 ]; then
+        for v in $(ls /etc/php/); do
+            if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
+                continue
+            fi
+            echo "(*) Updating Multi-PHP configuration..."
+            cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$v/fpm/pool.d/
+            v1=$(echo "$v" | sed -e 's/[.]//')
+            sed -i "s/9999/99$v1/g" /etc/php/$v/fpm/pool.d/dummy.conf
+        done
+    fi
 fi
 
 # Set Purge to false in Roundcube configuration - https://goo.gl/3Nja3u