installer korrigiert wire-g korrigiert

This commit is contained in:
Désiré Werner Menrath 2023-11-02 11:01:37 +01:00
parent 64e2864b2d
commit 7b5050ef0d
2 changed files with 8 additions and 8 deletions

View File

@ -14,22 +14,22 @@ echo Wire-G wird installiert.
if grep -i 'mint\|debian\|ubuntu\|pop|' /etc/os-release > /dev/null 2>&1 if grep -i 'mint\|debian\|ubuntu\|pop|' /etc/os-release > /dev/null 2>&1
then then
if ! which yad > /dev/null ; then sudo apt install yad -y > /dev/null ; fi if ! which yad > /dev/null ; then sudo apt install yad -y > /dev/null 2>&1 ; fi
echo yad wird installiert. Bitte warten... echo yad wird installiert. Bitte warten...
if ! which notify-send > /dev/null ; then sudo apt install libnotify-bin -y > /dev/null ; fi if ! which notify-send > /dev/null ; then sudo apt install libnotify-bin -y > /dev/null 2>&1 ; fi
echo libnotify wird installiert. Bitte warten... echo libnotify wird installiert. Bitte warten...
elif grep -i 'arch\|manjaro\|garuda\|endeavour|' /etc/os-release > /dev/null 2>&1 elif grep -i 'arch\|manjaro\|garuda\|endeavour|' /etc/os-release > /dev/null 2>&1
then then
if ! which yad > /dev/null ; then sudo pacman -S --noconfirm yad > /dev/null ; fi if ! which yad > /dev/null ; then sudo pacman -S --noconfirm yad > /dev/null 2>&1 ; fi
echo yad wird installiert. Bitte warten... echo yad wird installiert. Bitte warten...
if ! which notify-send > /dev/null ; then sudo pacman -S --noconfirm libnotify > /dev/null ; fi if ! which notify-send > /dev/null ; then sudo pacman -S --noconfirm libnotify > /dev/null 2>&1 ; fi
echo libnotify wird installiert. Bitte warten... echo libnotify wird installiert. Bitte warten...
elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1 elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
then then
if ! which yad > /dev/null ; then sudo dnf install yad > /dev/null ; fi if ! which yad > /dev/null ; then sudo dnf install yad > /dev/null 2>&1 ; fi
echo yad wird installiert. Bitte warten... echo yad wird installiert. Bitte warten...
if ! which notify-send > /dev/null ; then sudo dnf install libnotify > /dev/null ; fi if ! which notify-send > /dev/null ; then sudo dnf install libnotify > /dev/null 2>&1 ; fi
echo libnotify wird installiert. Bitte warten... echo libnotify wird installiert. Bitte warten...
elif grep -i 'suse' /etc/os-release > /dev/null 2>&1 elif grep -i 'suse' /etc/os-release > /dev/null 2>&1

4
wire_g
View File

@ -111,7 +111,7 @@ remove(){
--fixed --buttons-layout=center \ --fixed --buttons-layout=center \
--button=$"OK" --button=$"Cancel" \ --button=$"OK" --button=$"Cancel" \
--separator="" --window-icon=${wg_pic}wg-trash.png \ --separator="" --window-icon=${wg_pic}wg-trash.png \
--borders=8 --column=$'Delete' $tunnel) --borders=8 --column=$"Delete" $tunnel)
then then
nmcli connection delete $selection &> ${wg_wdir}.tmp.txt nmcli connection delete $selection &> ${wg_wdir}.tmp.txt
success=$(grep -i 'erfolgreich gelöscht\|successfully deleted' ${wg_wdir}.tmp.txt) success=$(grep -i 'erfolgreich gelöscht\|successfully deleted' ${wg_wdir}.tmp.txt)
@ -212,7 +212,7 @@ if selection=$(yad --no-click --list \
<b>----------------------------------------------------------------------------------</b> <b>----------------------------------------------------------------------------------</b>
<b>If no tunnels are listed,</b> <b>If no tunnels are listed,</b>
<b>so they have to import their tunnel beforehand.</b>" \ <b>so they have to import their tunnel beforehand.</b>" \
--column=$'Selection' $tunnel) --column=$"Selection" $tunnel)
then then
if [[ -n $active ]] if [[ -n $active ]]