diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-04-21 22:18:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 22:18:42 +0300 |
| commit | a4c347834a6bfa41ec7a9a26c5512af2eeadd7f7 (patch) | |
| tree | df499b0931eefe4417f05822c20e9fa514037315 | |
| parent | e23a202724cd420888b93e40a7ab116e1f2da878 (diff) | |
| parent | 1dec014e3e1c623743b1ed51c7072d13d7f9492c (diff) | |
Merge pull request #4291 from dibdot/package-travelmate
travelmate: update 0.7.1
| -rw-r--r-- | net/travelmate/Makefile | 2 | ||||
| -rwxr-xr-x | net/travelmate/files/travelmate.init | 5 | ||||
| -rwxr-xr-x | net/travelmate/files/travelmate.sh | 11 |
3 files changed, 11 insertions, 7 deletions
diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile index c4a13778c..ed5d6c5fb 100644 --- a/net/travelmate/Makefile +++ b/net/travelmate/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=travelmate -PKG_VERSION:=0.7.0 +PKG_VERSION:=0.7.1 PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> diff --git a/net/travelmate/files/travelmate.init b/net/travelmate/files/travelmate.init index 8b988dbd1..6663dd173 100755 --- a/net/travelmate/files/travelmate.init +++ b/net/travelmate/files/travelmate.init @@ -11,7 +11,6 @@ trm_script="/usr/bin/travelmate.sh" boot() { - trm_boot=1 ubus -t 30 wait_for network.interface 2>/dev/null rc_procd start_service } @@ -20,10 +19,6 @@ start_service() { if [ $("${trm_init}" enabled; printf ${?}) -eq 0 ] then - if [ -n "${trm_boot}" ] - then - return 0 - fi procd_open_instance "travelmate" procd_set_param command "${trm_script}" "${@}" procd_set_param stdout 1 diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh index 2859a1049..6b9637336 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="0.7.0" +trm_ver="0.7.1" trm_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')" trm_enabled=0 trm_debug=0 @@ -267,6 +267,15 @@ f_main() sleep 5 done done + else + if [ ! -s "${trm_rtfile}" ] + then + config="$(ubus -S call network.wireless status | jsonfilter -l1 -e '@.*.interfaces[@.config.mode="sta"].section')" + sta_radio="$(uci -q get wireless."${config}".device)" + sta_ssid="$(uci -q get wireless."${config}".ssid)" + sta_iface="$(uci -q get wireless."${config}".network)" + f_jsnupdate "${sta_iface}" "${sta_radio}" "${sta_ssid}" + fi fi } |