diff --git a/bibVPN.sh b/bibVPN.sh
index e334d8b..569d8ac 100755
--- a/bibVPN.sh
+++ b/bibVPN.sh
@@ -8,12 +8,18 @@
#joesmith ALL=(ALL) NOPASSWD: /usr/bin/killall -2 openconnect
# VPN Status
-# v1.1
-# Jesse Jarzynka
-# jessejoe
+# v1.2
+# Thomas Schmauder
+# itssct
# Displays status of a VPN interface with option to connect/disconnect.
# http://i.imgur.com/RkmptwO.png
-# tunnel icon by Icons8
+# openconnect
+# https://git.bib.de/itssct/OpenFortiVPN_macOS
+# true
+# true
+# false
+# true
+# true
###################
#### Variables ####
###################
@@ -29,6 +35,14 @@ SETTINGSFILE="$WORKDIR/settings.csv"
ACCOUNTFILE="$WORKDIR/accounts.csv"
VPN_USERNAME="$2"
VPN_HOST="$3"
+
+#### Settings ####
+SHOW_SETTINGS='ON'
+SHOW_ICONS='ON'
+NET_FILTER='inet 172.[123][0-9].1[67][80].'
+FONT=( 'size=14' 'font=UbuntuMono' )
+
+
# A command that will result in your VPN password.
GET_VPN_PASSWORD="security find-generic-password -g -a $VPN_USERNAME 2>&1 >/dev/null | cut -d'\"' -f2"
# Command to determine if VPN is connected or disconnected
@@ -36,31 +50,9 @@ VPN_CONNECTED="ifconfig | egrep -A1 '$NET_FILTER' |cut -d' ' -f2"
# Command to run to disconnect VPN
VPN_DISCONNECT_CMD="sudo killall -2 openconnect"
-#### Settings ####
-SHOW_SETTINGS='OFF'
-SHOW_ICONS='OFF'
-NET_FILTER='inet 172.[123][0-9].1[67][80].'
-FONT=( 'size=14' 'font=UbuntuMono' )
-
# Get IP of Current VPN Tunnel
IP=$(ifconfig | egrep -A1 "$NET_FILTER" |cut -d' ' -f2)
-#### Icons ####
-ICON_connected_tnblk="iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAAGtemweAAAACXBIWXMAAAsSAAALEgHS3X78AAAA+klEQVR4nNRUwQ2DMAzMKy8WYIZOwb8LtUtAJSZp34zBCn3y4Y3cWLEr13KSllKhnnRKcvHZ4AScS6BJbUSMgRCncfJcaBG0KMcvMIj83ircWcUh9VTI46onO1A75sC2FIjpT0qHwMUy4AZSzuU6a7D2smDzLRu1Fi11aKRGJOHVyzKHlGExXu5MmlkJ6HpfRHbWx5SBR+tMtjNYOuQMfGV5Lecm8HSLQf8BH9iLC2BxoRiM/Qi9SnSlS1MRG9VLIM/bH4NM7Cgp/rImYkeaU4XQW8QsDBVpk9GeSRRnDb1FyCSWVtovYpcCtZG83rLALzwvuKskSNT2xwMAAP//L6vzxgAAAAJJREFUAwBX1u55AAAAAElFTkSuQmCC"
-ICON_disconnected_tnblk="iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAAGtemweAAAACXBIWXMAAAsSAAALEgHS3X78AAAA2klEQVR4nNxTQQ6DMAyrqvGAXfeK7Uh5wHbgyhlxaP//hDXClbLOXUHqhDZLFsGJEzUUYwq4lBIrpsiwhirQEDHxRSw69mFU/a1OJNHh+ZYILMHibThjHUtkXyuU9tdMD5GeGSQh1LF+/2hguQPRY0MTFlGEzQ6bOJYMnhzuBo1OCrjejqx0KhnSk32TdgamhyaGP4SNHNQFYPSokdpdGLJGd1yaDpT4kdWIZ/PPoBsLTriRM+igmWyQeKtYlKGDNpP1iGZQkzTxVqGbMK2Wr+KQAU09Xx/wW3gCAAD//+SvwXMAAAACSURBVAMAV9bueQAAAABJRU5ErkJggg=="
-
-#Icons 22x22
-ICON_connected_sw="iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAACXBIWXMAAAsTAAALEwEAmpwYAAABUElEQVR4nMWVMUsDQRSEPxUDQgrFkAgGA3YGEQsbCy2CnI2FVhEhKMRfoI2EFOKBChIUC0uLK/I7w4NZeCSXy0WNGRhY9s0Mu2/3bmHOWAJK4vJvwxaAQ+Ac+Ab6oo0vVDPNVFgDHhV0DLRdcFtzNn7SLnJhHfh0Qe9ABUjEiuZC/StP+CJwo60mztwCLoGm6mE+Uauu5B2LI/XwBKgBb8B+im4P6AFb0pqnkRUcu9VY/+oZWqs9O715U1EEXoGOeOdqK8CuaOOAe6d/UcYIasC1tmQ8dbUqcCvaOODM6VvKGMGO25YxYjKiIU9q6+qzDG66NoTgkmtDYLi3kbQNeccGxzqIrgsuuIMLLLjgrjzxXFrRn1XwAVDWlTLTqr6wjyH2VIukLcv7vyve/oNgy0h9JTpOZD/ySTBN0D9k/eHsRdgANnOEBpjWPFO/Jj/CAMAHVcy+L0q4AAAAAElFTkSuQmCC"
-ICON_disconnected_sw="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ZDItYWQyMi0xODNiNjM0Y2JiNzUiCiAgIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MGU1NWIxY2YtYmU3Zi00YjNhLWEwNzQtYTQ5YTM1ZDIwNGQyIgogICB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZjczNzE5NDAtMGJmZC00ODAwLTk1NmEtYjMxNWEyZjc3ZGI5IgogICBHSU1QOkFQST0iMi4wIgogICBHSU1QOlBsYXRmb3JtPSJNYWMgT1MiCiAgIEdJTVA6VGltZVN0YW1wPSIxNjc3Njk5MzM2MjM2MTEyIgogICBHSU1QOlZlcnNpb249IjIuMTAuMzIiCiAgIGRjOkZvcm1hdD0iaW1hZ2UvcG5nIgogICB0aWZmOk9yaWVudGF0aW9uPSIxIgogICB4bXA6Q3JlYXRvclRvb2w9IkdJTVAgMi4xMCIKICAgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMzowMzowMVQyMDozNTozNiswMTowMCIKICAgeG1wOk1vZGlmeURhdGU9IjIwMjM6MDM6MDFUMjA6MzU6MzYrMDE6MDAiPgogICA8eG1wTU06SGlzdG9yeT4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJzYXZlZCIKICAgICAgc3RFdnQ6Y2hhbmdlZD0iLyIKICAgICAgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpmZTI5NGVkYS01OWQ0LTQ2YWQtYjdkYS01M2YyZWY2NTU0ODYiCiAgICAgIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkdpbXAgMi4xMCAoTWFjIE9TKSIKICAgICAgc3RFdnQ6d2hlbj0iMjAyMy0wMy0wMVQyMDozNTozNiswMTowMCIvPgogICAgPC9yZGY6U2VxPgogICA8L3htcE1NOkhpc3Rvcnk+CiAgPC9yZGY6RGVzY3JpcHRpb24+CiA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg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kb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMC1FeGl2MiI+CiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICB4bWxuczpHSU1QPSJodHRwOi8vd3d3LmdpbXAub3JnL3htcC8iCiAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgeG1wTU06RG9jdW1lbnRJRD0iZ2ltcDpkb2NpZDpnaW1wOjViNjlkNTY5LWIxNTEtNGFkNC05YzhiLTM2MWQ1M2VmMDQzZiIKICAgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpkYzFlZGZjYS0xNzUzLTQxZGItODcwMi05ZTY5ODAxNDNkZTciCiAgIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpiZmQ5Njc1YS04MzRlLTRmMTItYjU4OC00ZWMwNDM4NGEzNTYiCiAgIEdJTVA6QVBJPSIyLjAiCiAgIEdJTVA6UGxhdGZvcm09Ik1hYyBPUyIKICAgR0lNUDpUaW1lU3RhbXA9IjE2Nzc2OTkxMTUyOTg5NjYiCiAgIEdJTVA6VmVyc2lvbj0iMi4xMC4zMiIKICAgZGM6Rm9ybWF0PSJpbWFnZS9wbmciCiAgIHRpZmY6T3JpZW50YXRpb249IjEiCiAgIHhtcDpDcmVhdG9yVG9vbD0iR0lNUCAyLjEwIgogICB4bXA6TWV0YWRhdGFEYXRlPSIyMDIzOjAzOjAxVDIwOjMxOjU1KzAxOjAwIgogICB4bXA6TW9kaWZ5RGF0ZT0iMjAyMzowMzowMVQyMDozMTo1NSswMTowMCI+CiAgIDx4bXBNTTpIaXN0b3J5PgogICAgPHJkZjpTZXE+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InNhdmVkIgogICAgICBzdEV2dDpjaGFuZ2VkPSIvIgogICAgICBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjY0YmYyMDM4LTQ5MWUtNDc1ZC1iZjVjLWY4NmZhZjgxZTlmYyIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iR2ltcCAyLjEwIChNYWMgT1MpIgogICAgICBzdEV2dDp3aGVuPSIyMDIzLTAzLTAxVDIwOjMxOjU1KzAxOjAwIi8+CiAgICA8L3JkZjpTZXE+CiAgIDwveG1wTU06SGlzdG9yeT4KICA8L3JkZjpEZXNjcmlwdGlvbj4KIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PukhqdYAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfnAwETHzdTDiqXAAACkklEQVRo3u2ZW2/TQBCFP+fSOKlpSUFNi0KR4Kn///cgIQECFVraOBdysc1Dj9EqcnzZbKsIdqQocvY258zOmfUGvHn7vy1wOFcHiIAB0NNzR20JsAaWwAKY6vkgAETAGRDKqbCi/2+gC6yAO2Cyz+LtPcb2gTHwCsiAj0AMDEuISYFPwE/1OwNOBGb9XAAC4Bx4Iybz7TOVIx2BK7JfAtkHXhtjT/U9a+pMy6L/W7G+bblDt2K6iP3brb6mDYF3Rt44B9ACroDjklzoAxvgvqD9Xm199d21La+a7IxWg20zLtkaVVGoYt+0nkAELnPgXBPPKlTmSAl9ov65E5naQuBlxVoP6n+svKrU7jpqM5R6LCV7lyVjB3LiTsoSKNIDbZ1sB7sb4JucbgPvBWK2bwTGYq8FzAXiQQDMaMyAz1KapYpXpk+q32KN7SpCJutf1KcNjAQ41HzWACJDcULJ3cpwZg28AH6IvaQGIamimGr+7xqf6flKzuc7JF/PCsCF2DeT/lQMzgVuosLU1BZGvsRaa1QgLB1FqDGAjiYtslB5kYhBW1uI9csShesKQNpURqMaCnbj4CxVZ47Ipg5UaX5ctjcb2KqGXPZtZLQnVSmafOTIeZOMDPi6w/kLmwgciZ1dOTB3CGBRUiDXxqGxUQRawIeS9o1DABsRdr2jPbOJQNVZJHUIoGquwNVx+uDMA/AAntCuLdrqvIR0Ha7nPAKZA8VpfBllGwVbS1yu55PYA/AAfB34+3bWrkFIYPSLDrEOVBWyzKgDTv6bcFUHkgZr5ndFsa8D/zqA9ID8TG0AzA4IwNQGwE1JcqbPyHJCyeVXu0JZJlKqriF7KY+XsYsnOIoPttaJebwrWuPNm7dC+wNk4Jc0wyP65AAAAABJRU5ErkJggg=="
-ICON_connected_clr="iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAABsElEQVR4nOVSPYsTURRNv7jd1oLsIpJ7xmyjlQEVQa10f8T6E4Rssa2ohZl7Eyz8AYoWfmBErZbdwsJCFnbvnWyzrE0QTSEWSRV5ITO+iTOTxCD48eDCm8s957x7zpRK//yRCFU23BWjXVH02NBlwwEb3Q4tuPDLxM0IJ9jwWoy+1duVJTYcimHgyt1Hva+stO1mZyIPo9NnROlTQqjYYMV6/C1KN0RR8wS7YYRzU5HL3qnjrPQuIbNhfZGIroqh7yo0uiaGz/4MK23d26usTBYwvJEoOMsRXRdDZ/Tilhgu3vkQLLhqaPm8GF6MyDtutt4OVlnpVTF5hOoI1HcW8D5dEqPN3HlFrbFfXhvapeg5bGHwrNRMrW30fPLG9CyNwf2i4SeiuOWKFY+cLT/EATbcHJYCcd+9mJWexjhRPMwXUGolJEaPH+jJY76AJ54I1NvLi24LT/xlwQapP2cwyZ6Zcb9fQLHjebkT91P+Z+SQh8sSeBsTuLsv4BH8lEMe7j/JgLP8H8thrgw4w//xHP6gDJQ+zivAiqPcwdBwJRZhw/tpBdxsTC4WXJ4W93ec7wYyDjZFMTOrAAAAAElFTkSuQmCC"
-ICON_disconnected_clr="iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAABk0lEQVR4nOVSPUvDUBTtLro5C4Kjg4tOFlSE6tDmnEe3zvoThDq4ijiLP0HRwQ+saCexg0MnV5eiSxF1ENHclyHyQhKfJemHH+DHg0uSm3vPufecl8n8+aPJrADrmrwU0hXyQQNXAqx5wPSHgV/IYQFOBHjyi8VBDTQ06QcBNExOyEchz01tb1M7zrgAtzEguazJBYtgUQPl6DvYSqnJrsCfySEBLixwX4B7j5wXQEy4pCPkXUvNmUuOdCQQ8lQrNeECELIZTljxlJrxS6U+Ex45JeRh+K8Z1Co1JuRxe2nIbDiNGAk8YFaTK6n1QNl1HJqnuQCmt63xAmzYa2vgoNPGmtx/JxW5mV4M7Aq5akID20aWmLxQGNXAkgnzHuXNxJrcs/q20jcgKxGIJnf8fL7fJohAbAI/lxsItojIgaN2677JQ/qd5Om579sJBKjFMgC1OG/pn+RDWl8SQdXSsmoTxAAJPqT1/RMPJEH/Vh8+5YEk6d/iw4/y4OYLCK5TCz3HmbNI6j0Q1CNwD8h12/c7zivjlhKXJdZXHAAAAABJRU5ErkJggg=="
-#Icons 20x20
-ICON_SW_con="iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAACXBIWXMAAAsTAAALEwEAmpwYAAABSUlEQVR4nMWUPUsDQRRFDypiMIKNFiq2aiHEYFBWyyCKqE2a3QhiIzb5AQaLFNqIVYqks9IiohZC/p88uANDnHWHCHrhwvDm7J2PnRn4By0DO0AVWBk3ZAI4Bq6ALjCUrX0NnAJTsWFzwIMCHoGaF1hTbShmvijMRr31Asx14Bl4AQ5G+m6A6Z8CUy0nUcATsAuUZNvLnvqMOQKyvDAb6VUjt4FzoBzgZtTXFvuWN8uqAgfAO7Dp9c3KTmvAh9gBsB0KPFFoRTNwWgTu5AWvfil2SyfimzJvs/sUq+/xWQhoeoBtfJF6Ht8MAWdagvlCtUmgA9zLHdUQU5Ht2+CRcZtsN8KppL9dVtup6/Hpnyy5AbRkuwGmPeBwxFZDTEtuxAYmgcAkNjD9xZLTELABfHrPVJHcs2bfrOdB9pjuA6sRgcYYuxTBjq8vMoJNLRNt7roAAAAASUVORK5CYII="
-ICON_SW_dis="iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA90lEQVR4nMWUAUvDMBSEv60qWzvaLm5lTlux+v9/oxxcIIR2Haj1wUHIu1zevaYP/iEegQoogaefCDXACeiBL0PrM9ACm3uFCuDVAm+uLgpW3ou5YklMt74kAkINfBh1lrssVRps52CBd1e1NbQenDu4LeFWdWNyc7BIHlvnLuaOc1WWTkbsM5FUfAd8JtxySrBxosxsPABXQ+sYzwm/metfbLb6tBRDwg+rCLaJBdnBzb5m2ExYbucqjE3WH5F/kPzD9Ak/rGL5CHSG3hh+vHUG7WFOZxxXEQy/bXnn1x/H1FLEsaYzOjsZGqaydM8gFUdcnfm7+AZbRA9nExQVjgAAAABJRU5ErkJggg=="
-ICON_CLR_con="iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAACXBIWXMAAAsTAAALEwEAmpwYAAAB/0lEQVR4nL2TT0hUcRDHBUuKCqpDxzyl9XbmV9ChPxcvlYhUkHgPgoSI8OZJ1zoIIaLtzBOEwPsq3brYIUi8pYS+fTMbwYIX8WIQevJgzHv7Xmv7tl0M/MHAj/l93nd+35nfa2s77kWh6/LFPfTD3IOCwtUjiRQPBtt9xRcsMM0Ca6x4EIXAGikSC7ya+3rzZEtiU4F3kQW+mAAprvhl6E8EbW+56ExgefaHu/RPsXzgdbDgh/RG0a3wKSlukcB2QXPPas9IYWFq8/bphoKsMGp2/DD3xARIocKKj99L9zkOvLMk+IgUNuzMGBYYYoV8pth8pfMUC/yMq8MiC76eXccLf3OT39wZEnwTMXFbftm3dYIkrtcESXGHFXb9EHqSs+nK9fMWqZOyu0UKe8aS4k5Bsa/ebggvTbRQxnt2uzRfutbJiksWM4F3Oc0LvDWWQrhvLyKrf/maQZQaNjoVxNKfAUF9H0lwvGZ6QTNBY1JecDwDwGGzEFlWnLBc/nPPCRL8yIKfLGxvudgRTiQ8KQ5nVRxLmswKq0nenoxN28L2NS1aTXhSGDsWyyOsOFeNYlzEDZDg88PhBqqWiwlPiiMtCcZ/zGFBy7UkyPbbHdEyK4zWAb7k7rLCfhVIh9JoGVNl9ymEO9lVQ9dFioPvvnteM0FjjJ0p3bjSjP2v9RsTL5ubaTZ9ggAAAABJRU5ErkJggg=="
-ICON_CLR_dis="iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAACXBIWXMAAAsTAAALEwEAmpwYAAAB0klEQVR4nL2Uv2vVUBTHC/5A0YJ1cNRJkf4DRZe3VEWCeff7DXcrVCi8goh06/T6qkPBycHJf6FKty51a3F8XWxnR3GpIFpyToYrJ01iaPJ4jwoNHAjnfvLhfG9uMjV13lfq3L2UfJYlyeOUvH8mSfD+ggIvhHynwL6SIS9gX4D3CrwKvd6lSWU3Bdg1gQBfMiAqhXZvvXyN3AvArXGyy0puVROdPPhcgO9C/hByqb6m5Mfg/dWRQgX6Fid1jiZQ8lvqXDfE8XTw/noKxEp+tTVjFFhWctA+3eLiFSF/Fnv1SYDXIYpmGtzCwjUh3xhTJPhlzzaEGfnEhEIeCfBbnetUkm73hlWVJEnmhPyTs+RR5tzTZlzypUkzct6mK/vH5B0hd6yOvb9d9gV4a2wGPLIT0SYc1I7H4ciN/rffh7WXM2gAAqzXhAcTCA+qkwCstwEreYSTyBvWC53ORQG2Bfhc1Lb1igE2Sl6BlbbIa+UmKzks+/mRiaKZvOJ4usYPa/zauUReVeBDXuSm9VIyUbJXL+sVE25WPLA6mdC+htNC5zipsH/WyAr0m0CSPBQyK6DqpYwUksPi08vUuQetkP1MBfCp97PjhMbkLHl3HPtf11+hG5+kEXZX9AAAAABJRU5ErkJggg=="
-ICON_CONNECTED=$ICON_CLR_con
-ICON_DISCONNECTED=$ICON_CLR_dis
###################
#### Functions ####
###################
@@ -82,9 +74,10 @@ function showSettings()
echo "---"
echo "Settings"
echo "--$SETTINGSFILE"
+ echo "--$WORKDIR"
echo "--Farbige Icons aus"
echo "--Tunnelblick Icons aus"
- echo "--Neuen User anlegen| shell='$0' param1=newuser terminal=false refresh=true"
+ echo "--Neuen User anlegen| shell='$0' param1=newuser terminal=true refresh=true"
fi
}
###################
@@ -112,7 +105,7 @@ case "$1" in
disconnect)
eval "$VPN_DISCONNECT_CMD"
# Wait for disconnection so menu item refreshes instantly
- until [ -z "$(eval "$VPN_CONNECTED")" ]; do sleep 1; done
+ until [ -z "$(eval "$VPN_CONNECTED")" ]; do sleep 1; eval "$VPN_CONNECTED" ;done
osascript -e 'display notification "VPN Tunnel erfolgreich geschlossen" with title "OpenFortiVPN" subtitle "Mach Feierabend" sound name "Submarine"'
;;
newuser)
@@ -135,18 +128,18 @@ case "$1" in
;;
esac
-#if [ -n "$(eval "$VPN_CONNECTED")" ]; then
if [ -f $OC_PIDFILE ]; then
- if [ $SHOW_ICONS == 'ON' ]; then echo "| templateImage=$ICON_CONNECTED| color=green" ; else echo "VPN ✔ |$FONT color=green" ; fi
+ if [ $SHOW_ICONS == 'ON' ]; then echo "| sfimage=firewall.fill | sfcolor=green" ; else echo "VPN ✔ |$FONT color=green" ; fi
echo '---'
echo "Disconnect VPN | bash='$0' param1=disconnect terminal=false refresh=true"
aUser=$(ps -ef | grep -e '--user\ ' | cut -d' ' -f 32)
if [[ $aUser =~ .*@.* ]]; then echo "User: $aUser" ; fi
echo "IP: $IP"
+ echo "Verbunden seit: $(stat $OC_PIDFILE | cut -d'"' -f4)"
showSettings
exit
else
- if [ $SHOW_ICONS == 'ON' ] ; then echo "| templateImage=$ICON_DISCONNECTED | color=Crimson" ; else echo "VPN ❌ | $FONT color=Crimson" ; fi
+ if [ $SHOW_ICONS == 'ON' ] ; then echo "| sfimage=firewall" ; else echo "VPN ❌ | $FONT color=Crimson" ; fi
echo '---'
# Alle User aus der accounts.csv auslesen und dann zur Auswahl anbieten.
cat "$ACCOUNTFILE" | while IFS= read config;