gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(luci-app-masterlink): Handle missing JSON fields in sbx-mesh-join

Browse Source 
Add || true to jsonfilter commands to prevent script exit when
optional fields (master_fingerprint, depth) are missing from API
response. The set -e directive was causing premature exit.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
CyberMind-FR 2026-03-26 15:17:44 +01:00
parent 349b20a750
commit 60334e96ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/secubox/luci-app-masterlink/root/usr/bin/sbx-mesh-join
View File

@ -165,10 +165,10 @@ main() {
local depth=""
if command -v jsonfilter >/dev/null; then
status=$(echo "$response" | jsonfilter -e '@.status' 2>/dev/null)
message=$(echo "$response" | jsonfilter -e '@.message' 2>/dev/null)
master_fp=$(echo "$response" | jsonfilter -e '@.master_fingerprint' 2>/dev/null)
depth=$(echo "$response" | jsonfilter -e '@.depth' 2>/dev/null)
status=$(echo "$response" | jsonfilter -e '@.status' 2>/dev/null || true)
message=$(echo "$response" | jsonfilter -e '@.message' 2>/dev/null || true)
master_fp=$(echo "$response" | jsonfilter -e '@.master_fingerprint' 2>/dev/null || true)
depth=$(echo "$response" | jsonfilter -e '@.depth' 2>/dev/null || true)
elif command -v jq >/dev/null; then
status=$(echo "$response" | jq -r '.status // empty')
message=$(echo "$response" | jq -r '.message // empty')