punix/Wire-G
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

import double fix 4

Browse Source
This commit is contained in:
Désiré Werner Menrath 2023-11-17 21:18:09 +01:00
parent 24147fae89
commit 38dae9ef31
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
wire_g
View File

@ -91,34 +91,33 @@ import_wg(){
--borders=8 --undecorated \ --borders=8 --undecorated \
--timeout-indicator=bottom --skip-taskbar --timeout-indicator=bottom --skip-taskbar
import_wg import_wg
else else
case "$WG_CONF" in case "$WG_CONF" in
*_*.conf) if grep -i 'PEER\|PublicKey' $WG_CONF > /dev/null && grep -i 'Interface\|PrivateKey' $WG_CONF > /dev/null *_*.conf) if grep -i 'PEER\|PublicKey' $WG_CONF > /dev/null && grep -i 'Interface\|PrivateKey' $WG_CONF > /dev/null
then then
ACTIVE=$(nmcli connection show --active | grep -iPo "(.*)(wireguard)" | sed 's/ .*//') ACTIVE=$(nmcli connection show --active | grep -iPo "(.*)(wireguard)" | sed 's/ .*//')
if [[ -n $ACTIVE ]] if [[ -n $ACTIVE ]]
then then
wg_stop wg_stop
nmcli connection import type wireguard file $WG_CONF &> ${WG_WDIR}.tmp.txt nmcli connection import type wireguard file $WG_CONF &> ${WG_WDIR}.tmp.txt
wait wait
wg_notify wg_notify
else else
kill $lines kill $lines
nmcli connection import type wireguard file $WG_CONF &> ${WG_WDIR}.tmp.txt nmcli connection import type wireguard file $WG_CONF &> ${WG_WDIR}.tmp.txt
wait wait
wg_notify wg_notify
fi fi
fi ;;
*) yad --image-on-top --image=${WG_PIC}wg-info.png --height=150 --width=240 \ *) yad --image-on-top --image=${WG_PIC}wg-info.png --height=150 --width=240 \
--text-align=center --undecorated --skip-taskbar \ --text-align=center --undecorated --skip-taskbar \
--borders=12 --button="OK" --buttons-layout=center --center \ --borders=12 --button="OK" --buttons-layout=center --center \
--text $"<b>Oh, something went wrong. No valid Wireguard file. </b> \n --text $"<b>Oh, something went wrong. No valid Wireguard file. </b> \n
<b>Here is an example:</b><span color='#0fad0a'><b> my_wireguard.conf</b></span>" <b>Here is an example:</b><span color='#0fad0a'><b> my_wireguard.conf</b></span>"
import_wg ;; import_wg ;;
esac esac
fi } fi }