diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile index c39b6ffb2f..25e38d122e 100644 --- a/net/travelmate/Makefile +++ b/net/travelmate/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=travelmate PKG_VERSION:=2.1.2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/travelmate/files/travelmate.mail b/net/travelmate/files/travelmate.mail index 74a3a6fc9e..0b12866b60 100755 --- a/net/travelmate/files/travelmate.mail +++ b/net/travelmate/files/travelmate.mail @@ -1,10 +1,10 @@ #!/bin/sh # send mail script for travelmate notifications -# Copyright (c) 2020-2022 Dirk Brenken (dev@brenken.org) +# Copyright (c) 2020-2024 Dirk Brenken (dev@brenken.org) # This is free software, licensed under the GNU General Public License v3. # set (s)hellcheck exceptions -# shellcheck disable=1091,3040 +# shellcheck disable=all # Please note: you have to setup the package 'msmtp' before using this script @@ -43,7 +43,7 @@ trm_mailhead="From: ${trm_mailsender}\nTo: ${trm_mailreceiver}\nSubject: ${trm_m # mail body # -trm_mailtext="
"
+trm_mailtext="
"
 trm_mailtext="${trm_mailtext}\n++\n++ System Information ++\n++\n${sys_info}"
 trm_mailtext="${trm_mailtext}\n\n++\n++ Travelmate Information ++\n++\n${trm_info}"
 trm_mailtext="${trm_mailtext}
"
diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh
index dfa4b86584..7dbb357ca5 100755
--- a/net/travelmate/files/travelmate.sh
+++ b/net/travelmate/files/travelmate.sh
@@ -234,13 +234,13 @@ f_vpn() {
 				if [ "${vpn_status}" = "true" ] && [ "${iface}" != "${vpn_iface}" ]; then
 					/sbin/ifdown "${iface}"
 					f_log "info" "take down vpn interface '${iface}/${vpn_instance:-"-"}' (switch)"
+					rm -f "${trm_vpnfile}"
+					break
 				fi
 				if [ -x "/etc/init.d/openvpn" ] && [ -n "${vpn_instance}" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
 					/etc/init.d/openvpn stop "${vpn_instance}"
 					f_log "info" "take down openvpn instance '${vpn_instance:-"-"}' (switch)"
 				fi
-				rm -f "${trm_vpnfile}"
-				break
 			done
 		fi
 		if [ -x "${trm_vpnpgm}" ] && [ -n "${vpn_service}" ] && [ -n "${vpn_iface}" ]; then
@@ -952,7 +952,7 @@ f_main() {
 					if [ -n "${scan_quality}" ] && [ -n "${scan_open}" ] && [ -n "${scan_bssid}" ] && [ -n "${scan_essid}" ]; then
 						f_log "debug" "f_main-7  ::: radio(sta/scan): ${sta_radio}/${radio}, essid(sta/scan): \"${sta_essid}\"/${scan_essid}, bssid(sta/scan): ${sta_bssid}/${scan_bssid}, quality(min/scan): ${trm_minquality}/${scan_quality}, open: ${scan_open}"
 						if [ "${scan_quality}" -lt "${trm_minquality}" ]; then
-							continue 3
+							continue 2
 						elif [ "${scan_quality}" -ge "${trm_minquality}" ]; then
 							if [ "${trm_autoadd}" = "1" ] && [ "${scan_open}" = "+" ] && [ "${scan_essid}" != "unknown" ]; then
 								open_essid="${scan_essid%?}"