From e8914335cf4d9c43c7555c8a5e5613b33fa236b3 Mon Sep 17 00:00:00 2001
From: SKP <jash@schulterklopfer-productions.de>
Date: Thu, 28 Mar 2019 13:11:20 +0100
Subject: [PATCH] added more information to installation.json

---
 .../app/templates/installer/testfeatures.sh   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh b/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
index 7d604f4..a1f7f65 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
+++ b/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
@@ -273,7 +273,7 @@ fi
 #    { "name": "sparkwallet", "working":true }
 #  ]
 
-result="${containers},\"features\":[{\"name\":\"gatekeeper\",\"working\":"
+result="${containers},\"features\":[{\"coreFeature\":true, \"name\":\"cyphernode proxy\",\"working\":true}, {\"coreFeature\":true, \"name\":\"gatekeeper\",\"working\":"
 status=$(echo "{${containers}}" | jq ".containers[] | select(.name == \"gatekeeper\") | .active")
 if [ "${status}" = "true" ]; then
   timeout_feature checkgatekeeper
@@ -284,7 +284,18 @@ fi
 finalreturncode=$((${returncode} | ${finalreturncode}))
 result="${result}$(feature_status ${returncode} 'Gatekeeper error!')}"
 
-result="${result},{\"name\":\"pycoin\",\"working\":"
+result="${result},{\"coreFeature\":true, \"name\":\"bitcoin\",\"working\":"
+status=$(echo "{${containers}}" | jq ".containers[] | select(.name == \"bitcoin\") | .active")
+if [[ "${brokenproxy}" != "true" && "${status}" = "true" ]]; then
+  timeout_feature checkbitcoinnode
+  returncode=$?
+else
+  returncode=1
+fi
+finalreturncode=$((${returncode} | ${finalreturncode}))
+result="${result}$(feature_status ${returncode} 'Bitcoin error!')}"
+
+result="${result},{\"coreFeature\":true, \"name\":\"pycoin\",\"working\":"
 status=$(echo "{${containers}}" | jq ".containers[] | select(.name == \"pycoin\") | .active")
 if [[ "${brokenproxy}" != "true" && "${status}" = "true" ]]; then
   timeout_feature checkpycoin
@@ -296,7 +307,7 @@ finalreturncode=$((${returncode} | ${finalreturncode}))
 result="${result}$(feature_status ${returncode} 'Pycoin error!')}"
 
 <% if (features.indexOf('otsclient') != -1) { %>
-result="${result},{\"name\":\"otsclient\",\"working\":"
+result="${result},{\"coreFeature\":false, \"name\":\"otsclient\",\"working\":"
 status=$(echo "{${containers}}" | jq ".containers[] | select(.name == \"otsclient\") | .active")
 if [[ "${brokenproxy}" != "true" && "${status}" = "true" ]]; then
   timeout_feature checkots
@@ -308,19 +319,8 @@ finalreturncode=$((${returncode} | ${finalreturncode}))
 result="${result}$(feature_status ${returncode} 'OTSclient error!')}"
 <% } %>
 
-result="${result},{\"name\":\"bitcoin\",\"working\":"
-status=$(echo "{${containers}}" | jq ".containers[] | select(.name == \"bitcoin\") | .active")
-if [[ "${brokenproxy}" != "true" && "${status}" = "true" ]]; then
-  timeout_feature checkbitcoinnode
-  returncode=$?
-else
-  returncode=1
-fi
-finalreturncode=$((${returncode} | ${finalreturncode}))
-result="${result}$(feature_status ${returncode} 'Bitcoin error!')}"
-
 <% if (features.indexOf('lightning') != -1) { %>
-result="${result},{\"name\":\"lightning\",\"working\":"
+result="${result},{\"coreFeature\":false, \"name\":\"lightning\",\"working\":"
 status=$(echo "{${containers}}" | jq ".containers[] | select(.name == \"lightning\") | .active")
 if [[ "${brokenproxy}" != "true" && "${status}" = "true" ]]; then
   timeout_feature checklnnode