From f74c9a72453ecf8fd2e6b18213a67f46404525a2 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Sun, 19 Nov 2023 20:05:23 +0100
Subject: [PATCH] installer angepasst

---
 installer1.0.5                           | 11 +++--------
 wg_on_start.desktop => wgonstart.desktop |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename wg_on_start.desktop => wgonstart.desktop (71%)
 mode change 100755 => 100644

diff --git a/installer1.0.5 b/installer1.0.5
index 0004754..d29eff4 100755
--- a/installer1.0.5
+++ b/installer1.0.5
@@ -14,29 +14,23 @@
 ############################################################################################################ 
 
 # abfrage ob benötigte pakete installiert sind, wenn nicht dann installiere automatisch die benötigten Pakete.
-if [ -d /home/"$USER"/.local/bin ]
-    then 
-    mkdir -p /home/"$USER"/.local/bin
-fi
+
 if grep -i 'mint\|debian\|ubuntu\|pop|' /etc/os-release > /dev/null 2>&1
     then
         echo Wire-G wird installiert...
         mkdir -p /home/"$USER"/.icons ; cp icons/* /home/"$USER"/.icons/ ; mkdir -p /home/"$USER"/.config/wg_nmcli 
-        cp wg_on_start /home/"$USER"/.local/bin/ ; chmod +x /home/"$USER"/.local/bin/wg_on_start
         if ! which yad  > /dev/null ; then sudo apt install yad -y > /dev/null 2>&1 ; echo yad wird installiert. Bitte warten... ; fi
         
 elif grep -i 'arch\|manjaro\|garuda\|endeavour|' /etc/os-release > /dev/null 2>&1
     then
         echo Wire-G wird installiert...
         mkdir -p /home/"$USER"/.icons ; cp icons/* /home/"$USER"/.icons/ ; mkdir -p /home/"$USER"/.config/wg_nmcli
-        cp wg_on_start /home/"$USER"/.local/bin/ ; chmod +x /home/"$USER"/.local/bin/wg_on_start
         if ! which yad  > /dev/null ; then sudo pacman -S --noconfirm yad > /dev/null 2>&1 ; echo yad wird installiert. Bitte warten... ; fi 
         
 elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
     then
         echo Wire-G wird installiert...
         mkdir -p /home/"$USER"/.icons ; cp icons/* /home/"$USER"/.icons/ ; mkdir -p /home/"$USER"/.config/wg_nmcli
-        cp wg_on_start /home/"$USER"/.local/bin/; chmod +x /home/"$USER"/.local/bin/wg_on_start
         if ! which yad  > /dev/null ; then sudo dnf install yad > /dev/null 2>&1 ; echo yad wird installiert. Bitte warten... ; fi
         
 elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
@@ -52,7 +46,6 @@ elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
             then 
             echo Wire-G wird installiert...
             mkdir -p /home/"$USER"/.icons ; cp icons/* /home/"$USER"/.icons/ ; mkdir -p /home/"$USER"/.config/wg_nmcli
-            cp wg_on_start /home/"$USER"/.local/bin/ ; chmod +x /home/"$USER"/.local/bin/wg_on_start
             
         else 
         exit 1 
@@ -85,6 +78,8 @@ wait;
 sudo mkdir -p /usr/share/icons/Arch-Symbole ; sudo cp icons/wg-vpn.png /usr/share/icons/Arch-Symbole/
 wait;
 sudo cp wire_g /sbin/ ; sudo chmod +x /sbin/wire_g ; sudo cp wg_stop /sbin/ ; sudo chmod +x /sbin/wg_stop
+wait;
+sudo cp wg_on_start /sbin/ ; sudo chmod +x /sbin/wg_on_start
 wait; sudo cp Wire-G.desktop /usr/share/applications/
 echo
 case $LANG in
diff --git a/wg_on_start.desktop b/wgonstart.desktop
old mode 100755
new mode 100644
similarity index 71%
rename from wg_on_start.desktop
rename to wgonstart.desktop
index d523928..7a711b2
--- a/wg_on_start.desktop
+++ b/wgonstart.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Name=wg_on_start
-Name[de_DE]=wg_on_start
-Exec=/home/"$USER"/.local/bin/./wg_on_start
+Name[de_DE]=wgonstart.desktop
+Exec=wg_on_start
 NoDisplay=true
 Terminal=false
 Comment=Start on Wire-G Notify with Tunnel