From 380a5110b4d8df56c2a66c78657ee84bbcd611d3 Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Sun, 25 Jul 2021 21:41:58 +0200
Subject: travelmate: update to 2.0.4

* code cleanup
* add auto login script for Julianahoeve beach resort (NL)
* add auto login script for Vodafone hotspots (DE)
* add auto login script for telekom hotspots (DE)
* enhance captive portal detection to support html redirects as well
* change default captive portal detection url to
  'detectportal.firefox.com'

Signed-off-by: Dirk Brenken <dev@brenken.org>
---
 net/travelmate/files/travelmate_ntp.hotplug | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'net/travelmate/files/travelmate_ntp.hotplug')

diff --git a/net/travelmate/files/travelmate_ntp.hotplug b/net/travelmate/files/travelmate_ntp.hotplug
index 2a215e4ba..6a9be8219 100755
--- a/net/travelmate/files/travelmate_ntp.hotplug
+++ b/net/travelmate/files/travelmate_ntp.hotplug
@@ -1,34 +1,19 @@
 #!/bin/sh
 # ntp hotplug script for travelmate
-# Copyright (c) 2020 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2020-2021 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the GNU General Public License v3.
 
 # set (s)hellcheck exceptions
-# shellcheck disable=1091,2016,2039,2059,2086,2143,2181,2188
+# shellcheck disable=3023
 
 trm_init="/etc/init.d/travelmate"
 trm_ntpfile="/var/state/travelmate.ntp"
 trm_logger="$(command -v logger)"
 
-f_log()
-{
-	local class="${1}" log_msg="${2}"
-
-	if [ -x "${trm_logger}" ]
-	then
-		"${trm_logger}" -p "${class}" -t "trm-ntp  [${$}]" "${log_msg}"
-	else
-		printf "%s %s %s\\n" "${class}" "trm-ntp  [${$}]" "${log_msg}"
-	fi
-}
-
-if [ "${ACTION}" = "stratum" ] && [ ! -f "${trm_ntpfile}" ] && [ "$("${trm_init}" enabled; printf "%u" ${?})" = "0" ]
-then
+if [ "${ACTION}" = "stratum" ] && [ ! -f "${trm_ntpfile}" ] && "${trm_init}" enabled; then
 	{
-		flock -xn 1001
-		if [ "$?" = "0" ]
-		then
-			f_log "info" "get ntp time sync"
+		if flock -xn 1001; then
+			"${trm_logger}" -p "info" -t "trm-ntp  [${$}]" "get ntp time sync" 2>/dev/null
 			"${trm_init}" restart
 		fi
 	} 1001>"${trm_ntpfile}"
-- 
cgit v1.2.3