Browse Source

Version bump

Joachim M. Giæver 2 năm trước cách đây
mục cha
commit
a3e7284b87
3 tập tin đã thay đổi với 18 bổ sung1 xóa
  1. 1 1
      snap/snapcraft.yaml
  2. 12 0
      src/helper/functions
  3. 5 0
      src/hooks/install

+ 1 - 1
snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: zwavejs2mqtt
 base: core20
-version: 'v5.5.1'
+version: 'v5.5.2'
 summary: Fully configurable Zwave to MQTT Gateway and Control Panel. 
 description: |
   - Configurable Zwave to Mqtt Gateway

+ 12 - 0
src/helper/functions

@@ -13,6 +13,18 @@ function ensure_zwavejs_config {
     return 0
 }
 
+function get_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
+    return 0
+}
+
 function same_network_key {
     # SKIP NOW: NETWORK KEY SHOULD NOT BE USED
     # FAVOR SETTING

+ 5 - 0
src/hooks/install

@@ -15,6 +15,11 @@ set -e
 # # ensure_zwavejs_config
 #
 # testnset_config "network.key" "${SETTINGS_KEY}"
+
+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
 test_default_config
 
 snapctl stop --disable "${SNAP_NAME}.${SNAP_NAME}"