Installer now with query and remove

icons merged

Changelog

@@ -6,7 +6,13 @@ My standard System: Linux Mint 22 Cinnamon
  - os import in cls_mth_fc.py replaced by other methods
  - If Wire-Py already runs, prevent further start
  - for loops with lists replaced by List Comprehensions
- - Crypt and Decrypt Config Files in ~/.config/wire_py
+
+
+   ### Added
+09-04-0725
+
+ - Installer now with query and remove
+ - Icons merged
 
 
    ### Added

Wire-Py.desktop

@@ -4,4 +4,4 @@ Name=Wire-Py
 Exec=/usr/local/bin/wirepy.py
 Terminal=false
 Categories=Network;
-Icon=/usr/share/icons/wp-icons/128/wg_vpn.png
+Icon=/usr/share/icons/lx-icons/128/wg_vpn.png

cls_mth_fc.py

@@ -318,7 +318,7 @@ class Tunnel:
 
                         """img_w, img_i, w_title, w_txt hand over"""
                         iw = r'/usr/share/icons/lx-icons/64/info.png'
-                        ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
+                        ii = r'/usr/share/icons/lx-icons/48/wg_vpn.png'
                         wt = _('Export Successful')
                         msg_t = _('Your zip file is in home directory')
                         msg_window(iw, ii, wt, msg_t)
@@ -327,7 +327,7 @@ class Tunnel:
 
                         """img_w, img_i, w_title, w_txt hand over"""
                         iw = r'/usr/share/icons/lx-icons/64/error.png'
-                        ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                        ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                         wt = _('Export error')
                         msg_t = _('Export failed! Please try again')
                         msg_window(iw, ii, wt, msg_t)
@@ -336,7 +336,7 @@ class Tunnel:
 
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/lx-icons/64/info.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                 wt = _('Select tunnel')
                 msg_t = _('Please first import tunnel')
                 msg_window(iw, ii, wt, msg_t)

install

@@ -18,9 +18,9 @@ install_file_with(){
   else 
     sudo apt install python3-tk && \
     sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
-    sudo cp -uR wp-icons lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
+    sudo cp -uR lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
     sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
-    sudo cp -f Wire-Py.desktop /usr/share/applications/ 
+    sudo cp -fv Wire-Py.desktop /usr/share/applications/ 
 
   fi  
   }
@@ -39,113 +39,154 @@ install_arch_d(){
   else 
     sudo pacman -S --noconfirm tk python3 python-requests && \
     sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
-    sudo cp -uR wp-icons lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
+    sudo cp -uR lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
     sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
-    sudo cp -f Wire-Py.desktop /usr/share/applications/ 
+    sudo cp -fv Wire-Py.desktop /usr/share/applications/ 
    
   fi 
   }
 
-if grep -i 'debian' /etc/os-release > /dev/null 2>&1
+install(){
-  then
+  if grep -i 'debian' /etc/os-release > /dev/null 2>&1
-    groups > /tmp/isgroup
+    then
-    if grep 'sudo' /tmp/isgroup
+      groups > /tmp/isgroup
-      then
+      if grep 'sudo' /tmp/isgroup
-        install_file_with
+        then
-    else
+          install_file_with
-      echo -e "$BLUE"The installer found that they are not in the group sudo.""
+      else
-      echo -e "with "$RED"su -"$BLUE" "they can enter the root shell in which they then""
+        echo -e "$BLUE"The installer found that they are not in the group sudo.""
-      echo -e "enter "$GREEN""usermod -aG sudo $USER.""$BLUE""
+        echo -e "with "$RED"su -"$BLUE" "they can enter the root shell in which they then""
-      echo -e ""after logging in from the system, they can then run Wire-Py install again." $NORMAL"
+        echo -e "enter "$GREEN""usermod -aG sudo $USER.""$BLUE""
-      read -n 1 -s -r -p $"To close the Window press a button"
+        echo -e ""after logging in from the system, they can then run Wire-Py install again." $NORMAL"
-      clear
+        read -n 1 -s -r -p $"Press Enter to exit"
-      exit 0
-
-    fi
-
-elif grep -i 'mint\|ubuntu\|pop|' /etc/os-release > /dev/null 2>&1
-  then
-      install_file_with
-
-elif grep -i 'arch' /etc/os-release > /dev/null 2>&1
-  then
-    groups > /tmp/isgroup
-    clear
-    if grep 'wheel' /tmp/isgroup
-      then
-          install_arch_d
-    else
-        echo "The installer found that they are not in the group sudo."
-        echo "The sudoers file must be edited with"
-        echo -e "$RED""su -""$NORMAL"
-        echo -e "$GREEN"""EDITOR=nano visudo"""$NORMAL"
-        echo "Find the line:"
-        echo "## Uncomment to allow members of group wheel to execute any command"
-        echo "remove '#' on  # %wheel ALL=(ALL) ALL and save the file"
-        echo -e "then enter "$GREEN"gpasswd -a $USER wheel.""$NORMAL"
-        echo "after logging in from the system, they can then run Wire-Py install again."
-        read -n 1 -s -r -p $"To close the Window press a button"
         clear
         exit 0
 
-    fi
+      fi
 
-elif grep -i '|manjaro\|garuda\|endeavour|' /etc/os-release > /dev/null 2>&1
+  elif grep -i 'mint\|ubuntu\|pop|' /etc/os-release > /dev/null 2>&1
     then
-        install_arch_d
+        install_file_with
 
-elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
+  elif grep -i 'arch' /etc/os-release > /dev/null 2>&1
-  then
+    then
-    clear
+      groups > /tmp/isgroup
-    mkdir -p ~/.config/wire_py && touch ~/.config/wire_py/keys && cp -u settings ~/.config/wire_py/ && \
+      clear
-    mkdir -p ~/.config/systemd/user && cp -u wg_start.service ~/.config/systemd/user/ && \
+      if grep 'wheel' /tmp/isgroup
-    systemctl --user enable wg_start.service
+        then
-    sudo cp -f org.sslcrypt.policy /usr/share/polkit-1/actions/
+            install_arch_d
-    if [ $? -ne 0 ]
+      else
+          echo "The installer found that they are not in the group sudo."
+          echo "The sudoers file must be edited with"
+          echo -e "$RED""su -""$NORMAL"
+          echo -e "$GREEN"""EDITOR=nano visudo"""$NORMAL"
+          echo "Find the line:"
+          echo "## Uncomment to allow members of group wheel to execute any command"
+          echo "remove '#' on  # %wheel ALL=(ALL) ALL and save the file"
+          echo -e "then enter "$GREEN"gpasswd -a $USER wheel.""$NORMAL"
+          echo "after logging in from the system, they can then run Wire-Py install again."
+          read -n 1 -s -r -p $"Press Enter to exit"
+          clear
+          exit 0
+
+      fi
+
+  elif grep -i '|manjaro\|garuda\|endeavour|' /etc/os-release > /dev/null 2>&1
       then
+          install_arch_d
+
+  elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
+    then
+      clear
+      mkdir -p ~/.config/wire_py && touch ~/.config/wire_py/keys && cp -u settings ~/.config/wire_py/ && \
+      mkdir -p ~/.config/systemd/user && cp -u wg_start.service ~/.config/systemd/user/ && \
+      systemctl --user enable wg_start.service
+      sudo cp -f org.sslcrypt.policy /usr/share/polkit-1/actions/
+      if [ $? -ne 0 ]
+        then 
+            systemctl --user disable wg_start.service
+            rm -r ~/.config/wire_py && rm -r ~/.config/systemd
+            exit 0
+      else
+        sudo dnf install python3-tkinter -y
+        sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
+        sudo cp -uR lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
+        sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
+        sudo cp -fv Wire-Py.desktop /usr/share/applications/ 
+
+      fi
+  elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
+    then
+      clear
+      mkdir -p ~/.config/wire_py && touch ~/.config/wire_py/keys && cp -u settings ~/.config/wire_py/ && \
+      mkdir -p ~/.config/systemd/user && cp -u wg_start.service ~/.config/systemd/user/ && \
+      systemctl --user enable wg_start.service
+      sudo cp -f org.sslcrypt.policy /usr/share/polkit-1/actions/
+      if [ $? -ne 0 ]
+        then 
           systemctl --user disable wg_start.service
           rm -r ~/.config/wire_py && rm -r ~/.config/systemd
           exit 0
-    else
+      else 
-      sudo dnf install python3-tkinter -y
+        sudo zypper install python311-tk && \
-      sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
+        sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
-      sudo cp -uR wp-icons lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
+        sudo cp -uR lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
-      sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
+        sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
-      sudo cp -f Wire-Py.desktop /usr/share/applications/ 
+        sudo cp -fv Wire-Py.desktop /usr/share/applications/     
               
-    fi
+      fi
-elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
+      
-  then
+  else
-    clear
+      clear
-    mkdir -p ~/.config/wire_py && touch ~/.config/wire_py/keys && cp -u settings ~/.config/wire_py/ && \
+      echo $"Your System could not be determined."
-    mkdir -p ~/.config/systemd/user && cp -u wg_start.service ~/.config/systemd/user/ && \
+      echo
-    systemctl --user enable wg_start.service
+      read -n 1 -s -r -p $"Press Enter to exit"
-    sudo cp -f org.sslcrypt.policy /usr/share/polkit-1/actions/
+      clear
+      exit 0
+
+  fi
+  #clear
+  read -n 1 -s -r -p $"Press Enter to exit"
+  clear
+
+  }
+
+remove(){
+    sudo rm -f /usr/local/bin/wirepy.py /usr/local/bin/start_wg.py /usr/local/bin/cls_mth_fc.py /usr/local/bin/ssl_encrypt.py /usr/local/bin/ssl_decrypt.py 
     if [ $? -ne 0 ]
       then
-        systemctl --user disable wg_start.service
-        rm -r ~/.config/wire_py && rm -r ~/.config/systemd
         exit 0
     else 
-      sudo zypper install python311-tk && \
+      systemctl --user disable wg_start.service
-      sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
+      rm -r ~/.config/wire_py && rm -r ~/.config/systemd
-      sudo cp -uR wp-icons lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
+      sudo rm /usr/share/applications/Wire-Py.desktop
-      sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
+      sudo rm /usr/share/locale/de/LC_MESSAGES/languages/de/wirepy.mo
-      sudo cp -f Wire-Py.desktop /usr/share/applications/     
+      which syncpy >/dev/null
+      if [ $? -ne 0 ]
+        then 
+          sudo rm -r /usr/share/icons/lx-icons &&  sudo rm -r /usr/share/TK-Themes  
+      fi
 
+      echo
+      read -p "Press Enter to exit..."
     fi
 
-else
+  }
-    clear
-    echo $"Your System could not be determined."
-    echo
-    read -n 1 -s -r -p $"To close the window press a button"
-    clear
-    exit 0
-
-fi
-#clear
-read -n 1 -s -r -p $"To close the Window press a button"
-clear
-
 
+which wirepy >/dev/null
+if [ $? -eq 0 ]
+    then
+        echo "Do you want to update/reinstall or uninstall wirepy?"
+        echo
+        echo "Update/reinstall: press y, uninstall press r"
+        echo
+        read -n 1 -s -r -p "Cancel with any other key..."  result
+        case $result in
+            [y]* ) clear; install; exit;;
+            [Y]* ) clear; install; exit;;
+            [j]* ) clear; install; exit;;
+            [J]* ) clear; install; exit;;
+            [r]* ) clear; remove; exit;;
+            [R]* ) clear; remove; exit;;
+        esac
+        clear

wirepy.py

@@ -25,7 +25,7 @@ wg_tips = Tipi.if_tip(wg_set)
 dirname = Path('/tmp/tlecdcwg/')
 
 ''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
-version = 'v. 2.04.0725'
+version = 'v. 2.04.0925'
 
 res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases', version)
 
@@ -90,7 +90,7 @@ class Wirepy(tk.Tk):
                 self.tk.call('set_theme', 'dark')
 
         ''' Load the image file from disk. '''
-        self.wg_icon = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn.png')
+        self.wg_icon = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/48/wg_vpn.png')
 
         ''' Set it as the window icon '''
         self.iconphoto(True, self.wg_icon)
@@ -108,14 +108,14 @@ class FrameWidgets(ttk.Frame):
         self.dns = None
         self.address = None
         self.auto_con = None
-        self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-start.png')
+        self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/48/wg_vpn-start.png')
-        self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-stop.png')
+        self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/48/wg_vpn-stop.png')
-        self.imp_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_import.png')
+        self.imp_pic = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/48/wg_import.png')
-        self.tr_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_trash.png')
+        self.tr_pic = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/48/wg_trash.png')
-        self.exp_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_export.png')
+        self.exp_pic = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/48/wg_export.png')
         self.warning_pic = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/64/error.png')
-        self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-start.png')
+        self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/48/wg_vpn-start.png')
-        self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-stop.png')
+        self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/lx-icons/48/wg_vpn-stop.png')
 
         ''' Set on or off in file '''
 
@@ -180,8 +180,8 @@ class FrameWidgets(ttk.Frame):
                 webbrowser.open('https://git.ilunix.de/punix/Wire-Py')
 
             ''' img_w, img_i, w_title, w_txt , txt2, com hand over '''
-            iw = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
+            iw = r'/usr/share/icons/lx-icons/48/wg_vpn.png'
-            ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+            ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
             wt = _('Info')
             msg_t = (_('Wire-Py a simple Wireguard Gui for Linux systems.\n\n'
                        'Wire-Py is open source software written in Python.\n\n'
@@ -310,9 +310,9 @@ class FrameWidgets(ttk.Frame):
                                       command=lambda: GiteaUpdate.download(f'https://git.ilunix.de/punix'
                                                                            f'/Wire-Py/archive/'
                                                                            f'{res}.zip', r'/usr/'
-                                                                                         r'share/icons/wp-icons'
+                                                                                         r'share/icons/lx-icons'
                                                                                          r'/48/wg_vpn.png',
-                                                                           r'/usr/share/icons/wp-icons'
+                                                                           r'/usr/share/icons/lx-icons'
                                                                            r'/48/wg_msg.png', res))
 
         ''' Show active Tunnel '''
@@ -527,7 +527,7 @@ class FrameWidgets(ttk.Frame):
 
                     """img_w, img_i, w_title, w_txt hand over"""
                     iw = r'/usr/share/icons/lx-icons/64/info.png'
-                    ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                    ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                     wt = _('Select tunnel')
                     msg_t = _('Please select a tunnel from the list')
                     msg_window(iw, ii, wt, msg_t)
@@ -536,7 +536,7 @@ class FrameWidgets(ttk.Frame):
 
                     """img_w, img_i, w_title, w_txt hand over"""
                     iw = r'/usr/share/icons/lx-icons/64/info.png'
-                    ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                    ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                     wt = _('Select tunnel')
                     msg_t = _('Please first import tunnel')
                     msg_window(iw, ii, wt, msg_t)
@@ -642,7 +642,7 @@ class FrameWidgets(ttk.Frame):
 
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/lx-icons/64/info.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                 wt = _('Renaming not possible')
                 msg_t = _('The new name may contain only 12 characters')
                 msg_window(iw, ii, wt, msg_t)
@@ -651,7 +651,7 @@ class FrameWidgets(ttk.Frame):
 
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/lx-icons/64/info.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                 wt = _('Renaming not possible')
                 msg_t = _('At least one character must be entered')
                 msg_window(iw, ii, wt, msg_t)
@@ -660,7 +660,7 @@ class FrameWidgets(ttk.Frame):
 
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/lx-icons/64/info.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                 wt = _('Renaming not possible')
                 msg_t = _('No valid sign. These must not be used.\nBlank, Slash, Backslash and { }\n')
                 msg_window(iw, ii, wt, msg_t)
@@ -701,7 +701,7 @@ class FrameWidgets(ttk.Frame):
 
                     """img_w, img_i, w_title, w_txt hand over"""
                     iw = r'/usr/share/icons/lx-icons/64/info.png'
-                    ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                    ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                     wt = _('Renaming not possible')
                     msg_t = _('Please select a tunnel from the list')
                     msg_window(iw, ii, wt, msg_t)
@@ -801,7 +801,7 @@ class FrameWidgets(ttk.Frame):
                             if pre_key in p_key or pre_key + '\n' in p_key:
                                 """img_w, img_i, w_title, w_txt hand over"""
                                 iw = r'/usr/share/icons/lx-icons/64/error.png'
-                                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                                ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                                 wt = _('Import Error')
                                 msg_t = _('Tunnel already available!\nPlease use another file for import')
                                 msg_window(iw, ii, wt, msg_t)
@@ -925,7 +925,7 @@ class FrameWidgets(ttk.Frame):
             if 'PrivateKey = ' and 'Endpoint = ' not in read:
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/lx-icons/64/error.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                 wt = _('Import Error')
                 msg_t = _('Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
                 msg_window(iw, ii, wt, msg_t)
@@ -1147,7 +1147,7 @@ class FrameWidgets(ttk.Frame):
 
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/lx-icons/64/info.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                 wt = _('Select tunnel')
                 msg_t = _('Please select a tunnel from the list')
                 msg_window(iw, ii, wt, msg_t)
@@ -1156,7 +1156,7 @@ class FrameWidgets(ttk.Frame):
 
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/lx-icons/64/info.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                ii = r'/usr/share/icons/lx-icons/48/wg_msg.png'
                 wt = _('Select tunnel')
                 msg_t = _('Please first import tunnel')
                 msg_window(iw, ii, wt, msg_t)