osal_bool_tostring

bin/module/info.inc

@@ -14,7 +14,7 @@ hestia_module_info() {
 
         echo "Installed       : yes"
         echo "Description     : $(osal_kv_read $HESTIA_CONF_MODULES/${1}.conf 'description')"
-        echo "Enabled         : $(osal_bool_yes $module_enabled)"
+        echo "Enabled         : $(osal_bool_tostring $module_enabled)"
         echo "Variant         : $module_variant"
         echo "Version         : $module_version"
     else

bin/module/php/list.inc

@@ -19,8 +19,8 @@ hestia_module_php_list() {
     echo "Present PHP (FPM) versions"
     for php_version in $PHP_SUPPORTED_VERSIONS; do
         php_withoutdot=${php_version//.}
-        php_version_present=$(osal_kv_read_bool $HESTIA_CONF_MODULES/php.conf "php${php_withoutdot}_present")
-        echo PHP ${php_version}: $(osal_bool_yes $php_version_present 'present' 'not present')
+        php_version_present=$(osal_kv_read $HESTIA_CONF_MODULES/php.conf "php${php_withoutdot}_present" 0)
+        echo PHP ${php_version}: $(osal_bool_tostring $php_version_present 'present' 'not present')
     done
 
     exit 0

func/osal.sh

@@ -100,14 +100,15 @@ osal_kv_read_bool() {
     fi
 }
 
-osal_bool_yes() {
+# answer=$(osal_bool_tostring boolean_value yes_value no_value)
+osal_bool_tostring() {
     if [ "${1,,}" == "yes" ] \
         || [ "${1,,}" == "true" ] \
         || [ "${1,,}" == "on" ] \
         || [ "$1" == "1" ]; then
-        echo 'yes'
+        if [ -n "$2" ]; then echo "$2"; else echo 'yes'; fi
     else
-        echo 'no'
+        if [ -n "$3" ]; then echo "$3"; else echo 'no'; fi
     fi
 }