outsource interaction part to separate file; better name scheming; update default status values; small improvements

This commit is contained in:
2016-11-23 12:14:47 +01:00
parent abd7cfb381
commit 42e41f3968
5 changed files with 108 additions and 85 deletions

View File

@@ -1,7 +1,7 @@
#!/bin/bash
CURDIR=$(dirname "$(readlink -f "$0")")
source "$CURDIR"/shared.so
source "$CURDIR"/shared-functions.so
IP=$(wget -T 5 -q -O - $IPSERV4)
EXIT="$?"
@@ -10,12 +10,16 @@ if [ "$var_conn" == "on" ]; then
if $(echo $IP | grep -qE "$VPNIP"); then
IMAGE="/usr/share/icons/gnome/16x16/apps/gnome-monitor.png"
TEXT="VPN ($IP)"
var_ip4="$IP"
var_vpn="on"
echo "<img>$IMAGE</img>"
elif ([ "$EXIT" == 4 ] || [ "$EXIT" == 6 ] || [ "$EXIT" == 28 ]); then
EXIT="fail"
TEXT="t/o"
else
TEXT="$IP"
var_ip4="$IP"
var_vpn="off"
fi
echo "<txt> $TEXT</txt>"
@@ -25,11 +29,16 @@ if [ "$var_conn" == "on" ]; then
IP6=$(wget -T 5 -q -O - $IPSERV6)
EXIT="$?"
if ([ "$EXIT" == 4 ] || [ "$EXIT" == 6 ] || [ "$EXIT" == 28 ]); then
IP6="t/o"
TEXT="t/o"
else
TEXT="$IP6"
var_ip6="$IP6"
fi
echo "<tool>IPv6: $IP6</tool>"
echo "<tool>IPv6: $TEXT</tool>"
fi
else
echo "<txt>offline</txt>"
echo "<tool>Offline status is set. Turn on to enable checks</tool>"
fi
wtmp # Write changes back