Remove NETWORK_KEY env. var

src/helper/env-wrapper

@@ -14,13 +14,13 @@ function lprint {
     fi
 }
 
-export NETWORK_KEY=$(snapctl get network.key)
-
-SETTINGS_KEY=$(same_network_key "${NETWORK_KEY}")
-if [ $? -ne 0 ]; then
-    snapctl set network.key="${SETTINGS_KEY}"
-    export NETWORK_KEY="${SETTINGS_KEY}"
-fi
+# WITH S0+n NETWORK KEY IS NOT USED ANYMORE
+#export NETWORK_KEY=$(snapctl get network.key)
+# SETTINGS_KEY=$(same_network_key "${NETWORK_KEY}")
+# if [ $? -ne 0 ]; then
+#     snapctl set network.key="${SETTINGS_KEY}"
+#     export NETWORK_KEY="${SETTINGS_KEY}"
+# fi
 
 OPT_HELP=false
 
@@ -44,8 +44,8 @@ if [ ${OPT_HELP} = true ]; then
     echo ""
     echo "Set your configuration as descrived below"
     echo ""
-    echo "Base configuration values:"
-    echo "- network.key:               $(snapctl get network.key)"
+    # echo "Base configuration values:"
+    # echo "- network.key:               $(snapctl get network.key)"
     echo "Server configuration values: $(snapctl get server -d)"
     echo ""
     echo "- server.ssl: Use secure communication"

src/helper/functions

@@ -14,14 +14,16 @@ function ensure_zwavejs_config {
 }
 
 function same_network_key {
-    if [ -f "${SNAP_DATA}/settings.json" ]; then
-        SETTINGS_KEY=$(jq '.zwave.networkKey' -r ${SNAP_DATA}/settings.json)
-        if [ "${SETTINGS_KEY}" != "" ] && [ "${1}" != "${SETTINGS_KEY}" ]; then
-            echo "${SETTINGS_KEY}"
-            return 1
-        fi
-        return 0
-    fi
+    # SKIP NOW: NETWORK KEY SHOULD NOT BE USED
+    # FAVOR SETTING
+    # if [ -f "${SNAP_DATA}/settings.json" ]; then
+    #     SETTINGS_KEY=$(jq '.zwave.networkKey' -r ${SNAP_DATA}/settings.json)
+    #     if [ "${SETTINGS_KEY}" != "" ] && [ "${1}" != "${SETTINGS_KEY}" ]; then
+    #         echo "${SETTINGS_KEY}"
+    #         return 1
+    #     fi
+    #     return 0
+    # fi
     return 0
 }
 

src/hooks/configure

@@ -22,15 +22,16 @@ if [ ${COOKIE_SECURE} != true -a ${COOKIE_SECURE} != false ]; then
     exit 1
 fi
 
-NETWORK_KEY=$(snapctl get network.key)
-
-if [ ! -f "${SNAP_DATA}/settings.json" ]; then
-    echo "{}" > ${SNAP_DATA}/settings.json
-fi
-
-jq --arg networkKey "${NETWORK_KEY}" '.zwave.networkKey = $networkKey' $SNAP_DATA/settings.json > $SNAP_DATA/tmp.json
-cat ${SNAP_DATA}/tmp.json > ${SNAP_DATA}/settings.json
-rm ${SNAP_DATA}/tmp.json
+# AS WITH S0+n NETWORK_KEY is not used anymore
+# NETWORK_KEY=$(snapctl get network.key)
+#
+# if [ ! -f "${SNAP_DATA}/settings.json" ]; then
+#     echo "{}" > ${SNAP_DATA}/settings.json
+# fi
+#
+# jq --arg networkKey "${NETWORK_KEY}" '.zwave.networkKey = $networkKey' $SNAP_DATA/settings.json > $SNAP_DATA/tmp.json
+# cat ${SNAP_DATA}/tmp.json > ${SNAP_DATA}/settings.json
+# rm ${SNAP_DATA}/tmp.json
 
 test_default_config
 

src/hooks/install

@@ -4,16 +4,17 @@ source $SNAP/helper/functions
 
 set -e 
 
-SETTINGS_KEY=$(same_network_key "")
-
-if [ $? -eq 0 ]; then
-    SETTINGS_KEY=$(cat /dev/urandom | LC_ALL=C tr -dc '0-9A-F' | fold -w 32 | head -n 1)
-fi
-
-# Not needed anymore as of ZWAVEJS_EXTERNAL_CONFIG ?
-# ensure_zwavejs_config
-
-testnset_config "network.key" "${SETTINGS_KEY}"
+# AS OF S0+n NETWORK KEY IS NOT USED ANYMORE
+# SETTINGS_KEY=$(same_network_key "")
+#
+# if [ $? -eq 0 ]; then
+#     SETTINGS_KEY=$(cat /dev/urandom | LC_ALL=C tr -dc '0-9A-F' | fold -w 32 | head -n 1)
+# fi
+#
+# # Not needed anymore as of ZWAVEJS_EXTERNAL_CONFIG ?
+# # ensure_zwavejs_config
+#
+# testnset_config "network.key" "${SETTINGS_KEY}"
 test_default_config
 
 snapctl stop --disable "${SNAP_NAME}.${SNAP_NAME}"