Use IS_DSM_6 directly

SynoCommunity · Aug 7, 2023 · 95afd18 · 95afd18
1 parent 88df28f
commit 95afd18
Showing 1 changed file with 13 additions and 53 deletions.
diff --git a/...ps/src/wizard_templates/install_uifile.sh → spk/cops/src/wizard_templates/install_uifile b/...ps/src/wizard_templates/install_uifile.sh → spk/cops/src/wizard_templates/install_uifile
@@ -1,8 +1,4 @@
-
-
-cops_configuration_first_step() {
-  cat <<END_OF_STEP
-{
+[{
     "step_title": "{{{COPS_CONFIGURATION_FIRST_STEP_TITLE}}}",
     "items": [{
         "type": "textfield",
@@ -21,13 +17,7 @@ cops_configuration_first_step() {
             "desc": "{{{COPS_CATALOG_TITLE_LABEL}}}"
         }]
     }]
-}
-END_OF_STEP
-}
-
-cops_configuration_second_step() {
-  cat <<END_OF_STEP
-{
+},{
     "step_title": "{{{COPS_CONFIGURATION_SECOND_STEP_TITLE}}}",
     "items": [{
         "type": "multiselect",
@@ -37,27 +27,8 @@ cops_configuration_second_step() {
             "desc": "{{{DO_YOU_WANT_TO_USE_COPS_WITH_A_KOBO_LABEL}}}"
         }]
     }]
-}
-END_OF_STEP
-}
-
-dsm_permissions() {
-    cat <<END_OF_STEP
-{
-    "step_title": "{{{DSM_PERMISSIONS_TITLE}}}",
-    "items": [
-        {
-            "desc": "{{{DSM_PERMISSIONS_TEXT}}}"
-        }
-    ]
-}
-END_OF_STEP
-}
-
-{{^IS_DSM_7_OR_GREATER}}
-{{#IS_DSM_6_OR_GREATER}}
-php_configuration_requirements() {
-  cat <<END_OF_STEP
+},
+{{#IS_DSM_6}}
 {
     "step_title": "{{{PHP_CONFIGURATION_REQUIREMENTS_TITLE}}}",
     "items": [
@@ -68,24 +39,13 @@ php_configuration_requirements() {
             "desc": "<ul><li>gd</li><li>intl</li><li>pdo_sqlite</li><li>sqlite3</li><li>zlib</li></ul>"
         }
     ]
-}
-END_OF_STEP
-}
-{{/IS_DSM_6_OR_GREATER}}
-{{/IS_DSM_7_OR_GREATER}}
-
+},
+{{/IS_DSM_6}}
 {
-  echo "[";
-  cops_configuration_first_step;
-  echo ","
-  cops_configuration_second_step;
-  {{^IS_DSM_7_OR_GREATER}}
-  {{#IS_DSM_6_OR_GREATER}}
-  echo ",";
-  php_configuration_requirements;
-  {{/IS_DSM_6_OR_GREATER}}
-  {{/IS_DSM_7_OR_GREATER}}
-  echo ","
-  dsm_permissions;
-  echo "]";
-}> "${SYNOPKG_TEMP_LOGFILE}"
+    "step_title": "{{{DSM_PERMISSIONS_TITLE}}}",
+    "items": [
+        {
+            "desc": "{{{DSM_PERMISSIONS_TEXT}}}"
+        }
+    ]
+}]