Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

travelmate: update 0.9.6

Browse source 
* fix incomplete bssid logic
* add missing package dependencies
* Turris omnia compability fixes (LuCI, separate PR)
* OpenWrt theme fixes (LuCI, separate PR)

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2017-12-09 08:20:29 +01:00
parent 9fc66abcc0
commit 48f48991c3
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/travelmate/Makefile
View file

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate
PKG_VERSION:=0.9.5
PKG_VERSION:=0.9.6
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
@ -17,7 +17,7 @@ define Package/travelmate
SECTION:=net
CATEGORY:=Network
TITLE:=A wlan connection manager for travel router
DEPENDS:=+iwinfo
DEPENDS:=+iwinfo +jshn +jsonfilter
PKGARCH:=all
endef

31
net/travelmate/files/travelmate.sh
View file

@ -10,8 +10,8 @@
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
trm_ver="0.9.5"
trm_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
trm_ver="0.9.6"
trm_sysver="unknown"
trm_enabled=0
trm_debug=0
trm_automatic=1
@ -26,6 +26,23 @@ trm_rtfile="/tmp/trm_runtime.json"
#
f_envload()
{
local sys_call sys_desc sys_model sys_ver
# get system information
#
sys_call="$(ubus -S call system board 2>/dev/null)"
if [ -n "${sys_call}" ]
then
sys_desc="$(printf '%s' "${sys_call}" | jsonfilter -e '@.release.description')"
sys_model="$(printf '%s' "${sys_call}" | jsonfilter -e '@.model')"
sys_ver="$(cat /etc/turris-version 2>/dev/null)"
if [ -n "${sys_ver}" ]
then
sys_desc="${sys_desc}/${sys_ver}"
fi
trm_sysver="${sys_model}, ${sys_desc}"
fi
# initialize lists
#
trm_devlist=""
@ -123,7 +140,7 @@ f_check()
#
f_jsnupdate()
{
local iface="${1}" radio="${2}" essid="${3:-"n/a"}" bssid="${4:-"n/a"}"
local iface="${1}" radio="${2}" essid="${3:-"-"}" bssid="${4:-"-"}"
json_init
json_add_object "data"
@ -216,8 +233,10 @@ f_main()
sta_essid="$(uci -q get wireless."${config}".ssid)"
sta_bssid="$(uci -q get wireless."${config}".bssid)"
sta_iface="$(uci -q get wireless."${config}".network)"
if ([ -n "$(printf "%s" "${essid_list}" | grep -Fo "\"${sta_essid}\"")" ] ||\
[ -n "$(printf "%s" "${bssid_list}" | grep -Fo "${sta_bssid}")" ]) && [ "${dev}" = "${sta_radio}" ]
if (([ -n "$(printf "%s" "${essid_list}" | grep -Fo "\"${sta_essid}\"")" ] && [ -z "${sta_bssid}" ]) || \
([ -n "$(printf "%s" "${bssid_list}" | grep -Fo "${sta_bssid}")" ] && [ -z "$(printf "%s" "${essid_list}" | grep -Fo "\"${sta_essid}\"")" ]) || \
([ -n "$(printf "%s" "${essid_list}" | grep -Fo "\"${sta_essid}\"")" ] && [ -n "$(printf "%s" "${bssid_list}" | grep -Fo "${sta_bssid}")" ])) && \
[ "${dev}" = "${sta_radio}" ]
then
uci -q set wireless."${config}".disabled=0
f_check "sta"
@ -261,7 +280,7 @@ f_main()
if [ ! -s "${trm_rtfile}" ]
then
trm_ifstatus="false"
f_jsnupdate "n/a" "n/a" "n/a" "n/a"
f_jsnupdate "n/a" "n/a"
fi
else
if [ ! -s "${trm_rtfile}" ]