From 38dae9ef3136e4be0fb182417a5ce1b57804a2e4 Mon Sep 17 00:00:00 2001 From: punix Date: Fri, 17 Nov 2023 21:18:09 +0100 Subject: [PATCH] import double fix 4 --- wire_g | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/wire_g b/wire_g index 5363f59..b15c909 100755 --- a/wire_g +++ b/wire_g @@ -91,34 +91,33 @@ import_wg(){ --borders=8 --undecorated \ --timeout-indicator=bottom --skip-taskbar 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 - then - ACTIVE=$(nmcli connection show --active | grep -iPo "(.*)(wireguard)" | sed 's/ .*//') - if [[ -n $ACTIVE ]] - then - wg_stop - nmcli connection import type wireguard file $WG_CONF &> ${WG_WDIR}.tmp.txt - wait - wg_notify - else - kill $lines - nmcli connection import type wireguard file $WG_CONF &> ${WG_WDIR}.tmp.txt - wait - wg_notify - fi - fi ;; + *_*.conf) if grep -i 'PEER\|PublicKey' $WG_CONF > /dev/null && grep -i 'Interface\|PrivateKey' $WG_CONF > /dev/null + then + ACTIVE=$(nmcli connection show --active | grep -iPo "(.*)(wireguard)" | sed 's/ .*//') + if [[ -n $ACTIVE ]] + then + wg_stop + nmcli connection import type wireguard file $WG_CONF &> ${WG_WDIR}.tmp.txt + wait + wg_notify + else + kill $lines + nmcli connection import type wireguard file $WG_CONF &> ${WG_WDIR}.tmp.txt + wait + wg_notify + fi - *) yad --image-on-top --image=${WG_PIC}wg-info.png --height=150 --width=240 \ - --text-align=center --undecorated --skip-taskbar \ - --borders=12 --button="OK" --buttons-layout=center --center \ - --text $"Oh, something went wrong. No valid Wireguard file. \n + *) yad --image-on-top --image=${WG_PIC}wg-info.png --height=150 --width=240 \ + --text-align=center --undecorated --skip-taskbar \ + --borders=12 --button="OK" --buttons-layout=center --center \ + --text $"Oh, something went wrong. No valid Wireguard file. \n Here is an example: my_wireguard.conf" import_wg ;; - esac + esac fi }