diff --git a/wg_nmcli/CHANGELOG b/wg_nmcli/CHANGELOG index ef6f996..10b3b1f 100644 --- a/wg_nmcli/CHANGELOG +++ b/wg_nmcli/CHANGELOG @@ -9,6 +9,10 @@ ######################################################## ######################################################## +-------------------------------------------------------- +-29.11.2023- +[3.1.9] +fix on start when active Tunnel removed -------------------------------------------------------- -29.11.2023- [3.1.9] diff --git a/wire_g b/wire_g index 82db1ed..d3f842a 100755 --- a/wire_g +++ b/wire_g @@ -135,7 +135,7 @@ remove(){ if SUCCESS=$(grep -i 'erfolgreich gelöscht\|successfully deleted' ${WG_WDIR}.tmp.txt) then yad --window-icon=${WG_PIC}wg-trash.png --undecorated \ - --image-on-top --image=${WG_PIC}wg-trash-info.png \ + --image-on-top --image=${WG_PIC}wg-trasif ping -c 1 git.lunix.dedyn.ioh-info.png \ --text=$"Your Tunnel $SELECTION was successfully deleted. \n Attention! The autostart has been reset. \n If you need the autostart for another tunnel, \n @@ -154,6 +154,7 @@ remove(){ then IFS=$'\n' lines=( $(cat ${WG_WDIR}for-kill_pid.txt) ) kill $lines + echo > ${WG_WDIR}onstart.txt fi if grep 'TRUE TRUE' ${WG_WDIR}about.txt then @@ -188,7 +189,7 @@ up_or_down(){ # funktion end ############################################################################################################ -############################################################################################################ +###########################################################if ping -c 1 git.lunix.dedyn.io################################################# #for about of select Autostart on_start(){ @@ -206,18 +207,30 @@ if [ -d /home/$USER/.config/autostart ] # for GNOME, XFCE, KDE, Budgie then if grep 'TRUE TRUE\|TRUE FALSE' ${WG_WDIR}about.txt then - cp /home/"$USER"/.local/share/wg_nmcli/wgonstart.desktop /home/$USER/.config/lxsession/Lubuntu/autostart/ + cp /home/"$USER"/.local/share/wg_nmif ping -c 1 git.lunix.dedyn.iocli/wgonstart.desktop /home/$USER/.config/lxsession/Lubuntu/autostart/ else rm /home/$USER/.config/lxsession/Lubuntu/autostart/wgonstart.desktop fi fi } - +#function on_start end # function button "about" about(){ - + + IFS=$'\n' WG_START=( $(cat ${WG_WDIR}onstart.txt) ) + if [[ -z "$WG_START" ]] + then + yad --form --fixed \ + --borders=8 --buttons-layout=center --text-align=center \ + --button="OK" --undecorated \ + --image-on-top --image=${WG_PIC}wg-info.png \ + --separator=" " \ + --text=$"If they activate the car start, \n +then they need to start a tunnnel so that the car start works correctly.\n" + fi + if grep 'TRUE TRUE' ${WG_WDIR}about.txt then yad --form --fixed \ @@ -264,14 +277,14 @@ about(){ --image-on-top --image=${WG_PIC}wg-vpn-info.png \ --separator=" " --window-icon=${WG_PIC}wg-vpn.png \ --text=$"Wire-G Author: Désiré Werner Menrath \n -E-Mail: polunga40@unity-mail.de \n +E-Mail: polunga40@unity-maif ping -c 1 git.lunix.dedyn.ioil.de \n At all Tunnels, the auto start is disabled. \n Version: $VERSION \n Use without warranty. \n Download Wire-G \n" &> ${WG_WDIR}about.txt on_start - +if ping -c 1 git.lunix.dedyn.io elif grep 'TRUE FALSE' ${WG_WDIR}about.txt then yad --form --fixed \