From fe7d6d75228bdce97f627737f6b25829af0a9d5a Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Fri, 2 Mar 2018 18:09:34 +0100
Subject: [PATCH] travelmate: update 1.1.3

* fix remaining status oddities
* LuCI: show WiFi QR codes from all configured Access Points

Signed-off-by: Dirk Brenken <dev@brenken.org>
---
 net/travelmate/Makefile            |  2 +-
 net/travelmate/files/travelmate.sh | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
index 83297b96b..c04548f4c 100644
--- a/net/travelmate/Makefile
+++ b/net/travelmate/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=travelmate
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh
index 88ad802b3..35cc2ded6 100755
--- a/net/travelmate/files/travelmate.sh
+++ b/net/travelmate/files/travelmate.sh
@@ -10,7 +10,7 @@
 #
 LC_ALL=C
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-trm_ver="1.1.2"
+trm_ver="1.1.3"
 trm_sysver="unknown"
 trm_enabled=0
 trm_debug=0
@@ -179,7 +179,7 @@ f_check()
                         trm_ifstatus="$(ubus -S call network.interface dump 2>/dev/null | jsonfilter -l1 -e "@.interface[@.device=\"${ifname}\"].up")"
                     elif [ "${mode}" = "initial" ] && [ ${trm_ifquality} -lt ${trm_minquality} ]
                     then
-                        trm_connection=""
+                        trm_ifstatus="${status}"
                         sta_essid="$(printf "%s" "${dev_status}" | jsonfilter -l1 -e '@.*.interfaces[@.config.mode="sta"].*.ssid')"
                         sta_bssid="$(printf "%s" "${dev_status}" | jsonfilter -l1 -e '@.*.interfaces[@.config.mode="sta"].*.bssid')"
                         f_log "info" "uplink '${sta_essid:-"-"}/${sta_bssid:-"-"}' is out of range (${trm_ifquality}/${trm_minquality}), uplink disconnected (${trm_sysver})"
@@ -219,10 +219,12 @@ f_jsnup()
     if [ "${status}" = "true" ]
     then
         status="connected (${trm_connection:-"-"})"
-    elif [ "${status}" = "false" ]
-    then
+    else
         trm_connection=""
-        status="not connected"
+        if [ "${status}" = "false" ]
+        then
+            status="not connected"
+        fi
     fi
 
     dev_status="$(ubus -S call network.wireless status 2>/dev/null)"