Browse Source

Remove FPM text

Ernesto Nicolás Carrea 5 years ago
parent
commit
ec844d249c
2 changed files with 6 additions and 7 deletions
  1. 3 4
      bin/module/php/add.inc
  2. 3 3
      bin/module/php/del.inc

+ 3 - 4
bin/module/php/add.inc

@@ -36,7 +36,7 @@ hestia_module_php_add() {
         fi
         fi
     done
     done
     if [ ! "$php_version" ]; then
     if [ ! "$php_version" ]; then
-        echo "PHP (FPM) version $param_ver is not supported."
+        echo "PHP version $param_ver is not supported."
         return 1
         return 1
     fi
     fi
 
 
@@ -51,15 +51,14 @@ hestia_module_php_add() {
     # Check if php version is supported
     # Check if php version is supported
     # TODO:
     # TODO:
     if [ ! -f "$HESTIA_INSTALL_DIR/multiphp/$WEB_SYSTEM/PHP-${php_withoutdot}.sh" ]; then
     if [ ! -f "$HESTIA_INSTALL_DIR/multiphp/$WEB_SYSTEM/PHP-${php_withoutdot}.sh" ]; then
-        echo "$HESTIA_INSTALL_DIR/multiphp/$WEB_SYSTEM/PHP-${php_withoutdot}.sh"
-        echo "PHP (FPM) version ${php_version} is currently not supported or does not exist."
+        echo "PHP version ${php_version} is currently not supported or does not exist."
         return 1
         return 1
     fi
     fi
 
 
     # Perform verification if read-only mode is enabled
     # Perform verification if read-only mode is enabled
     check_hestia_demo_mode
     check_hestia_demo_mode
 
 
-    echo "Adding PHP (FPM) version ${php_version}..."
+    echo "Adding PHP version ${php_version}..."
 
 
     local php_prefix=$(osal_php_package_prefix $php_version)
     local php_prefix=$(osal_php_package_prefix $php_version)
 
 

+ 3 - 3
bin/module/php/del.inc

@@ -32,7 +32,7 @@ hestia_module_php_del() {
         fi
         fi
     done
     done
     if [ ! "$php_version" ]; then
     if [ ! "$php_version" ]; then
-        echo "PHP (FPM) version $param_ver is not supported."
+        echo "PHP version $param_ver is not supported."
         return 1
         return 1
     fi
     fi
 
 
@@ -40,14 +40,14 @@ hestia_module_php_del() {
 
 
     php_version_present=$(osal_kv_read_bool $HESTIA_CONF_MODULES/php.conf "php${php_withoutdot}_present" && echo 1)
     php_version_present=$(osal_kv_read_bool $HESTIA_CONF_MODULES/php.conf "php${php_withoutdot}_present" && echo 1)
     if [ ! "$php_version_present" ] && [ ! "$param_force" ]; then
     if [ ! "$php_version_present" ] && [ ! "$param_force" ]; then
-        echo "PHP (FPM) version ${php_version} is not present. See 'hestia module php list'."
+        echo "PHP version ${php_version} is not present. See 'hestia module php list'."
         return 0
         return 0
     fi
     fi
 
 
     # Perform verification if read-only mode is enabled
     # Perform verification if read-only mode is enabled
     check_hestia_demo_mode
     check_hestia_demo_mode
 
 
-    echo "Removing PHP (FPM) version ${php_version}..."
+    echo "Removing PHP version ${php_version}..."
 
 
     php_etc_folder=$(osal_multiphp_etc_folder $php_version)
     php_etc_folder=$(osal_multiphp_etc_folder $php_version)
     hestia_config_backup 'php-del' $php_etc_folder \
     hestia_config_backup 'php-del' $php_etc_folder \