README.md

Makefile

@@ -50,14 +50,12 @@ install: all
 	chmod 755 /usr/bin/dmenu_protonvpn
 	cp -rf config $(DESTDIR)$(PREFIX)/
 	cp -rf fonts $(DESTDIR)$(PREFIX)/
-	cp -rf menu $(DESTDIR)$(PREFIX)/
 	cp -rf icon $(DESTDIR)$(PREFIX)/
 	cp -rf icon/dmenu_protonvpn.desktop /usr/share/applications/
 	chmod +x /usr/share/applications/dmenu_protonvpn.desktop
 	touch $(DESTDIR)$(PREFIX)/proton-user.txt
 	touch $(DESTDIR)$(PREFIX)/proton-pass.txt
 	touch $(DESTDIR)$(PREFIX)/proton-credentials.txt
-	chmod 755 -R $(DESTDIR)$(PREFIX)/menu
 	chmod 755 -R $(DESTDIR)$(PREFIX)/icon
 	chmod 755 $(DESTDIR)$(PREFIX)/dmenu
 	chmod 755 $(DESTDIR)$(PREFIX)/dmenu_protonvpn
@@ -78,7 +76,6 @@ uninstall:
 		$(DESTDIR)$(PREFIX)/dmenu_protonvpn_cli\
 		$(DESTDIR)$(PREFIX)/config\
 		$(DESTDIR)$(PREFIX)/fonts\
-		$(DESTDIR)$(PREFIX)/menu\
 		$(DESTDIR)$(PREFIX)/icon\
 		$(DESTDIR)$(PREFIX)/proton-credentials.txt\
 		$(DESTDIR)$(MANPREFIX)/man1/dmenu.1\

README.md

@@ -16,7 +16,8 @@ _Note: Installation of `kitty` is opcional._
 * Open terminal and run the following commands:
 
   ```shell
-  $ git clone https://github.com/q3aql/dmenu_protonvpn
+  $ git clone https://git.q3aql.dev/q3aql/dmenu_protonvpn
+  $ cd dmenu_protonvpn
   $ sudo make install clean
   ````
 

dmenu_protonvpn

@@ -91,6 +91,8 @@ function insertCredentials() {
      sed -i "s/auth-user-pass/auth-user-pass ${sed_file_credentials}/g" "${1}"  
     fi
   fi
+  sed -i "s/up \/etc\/openvpn\/update-resolv-conf//g" "${1}"
+  sed -i "s/down \/etc\/openvpn\/update-resolv-conf//g" "${1}"
 }
 
 function editCredentialsText() {
@@ -122,12 +124,22 @@ function editCredentials() {
     openBrowser "${url_credentials}" &
     editCredentials
   elif [ "${select_output}" == "  Edit USER" ] ; then
-    ${termrun} "${menu_files}/edit-user-credential.sh"
+    user_openvpn=$(echo > /dev/null | /opt/dmenu_protonvpn/dmenu "$@" -p "  User OpenVPN / IKEv2:")
+    if [ -z "${user_openvpn}" ] ; then
+      echo "# User canceled"
+    else
+      echo "${user_openvpn}" > ${user_credentials}
+    fi
     cat ${user_credentials} > ${file_credentials}
     cat ${pass_credentials} >> ${file_credentials}
     editCredentials
   elif [ "${select_output}" == "  Edit PASS" ] ; then
-    ${termrun} "${menu_files}/edit-pass-credential.sh"
+    pass_openvpn=$(echo > /dev/null | /opt/dmenu_protonvpn/dmenu "$@" -p "  Password OpenVPN / IKEv2:")
+    if [ -z "${pass_openvpn}" ] ; then
+      echo "# Pass canceled"
+    else
+      echo "${pass_openvpn}" > ${pass_credentials}
+    fi
     cat ${user_credentials} > ${file_credentials}
     cat ${pass_credentials} >> ${file_credentials}
     editCredentials

dmenu_protonvpn_cli

@@ -65,6 +65,8 @@ function insertCredentials() {
      sed -i "s/auth-user-pass/auth-user-pass ${sed_file_credentials}/g" "${1}"  
     fi
   fi
+  sed -i "s/up \/etc\/openvpn\/update-resolv-conf//g" "${1}"
+  sed -i "s/down \/etc\/openvpn\/update-resolv-conf//g" "${1}"
 }
 
 function editCredentials() {
@@ -144,7 +146,6 @@ function connectprotonVPN() {
       echo -e " ${red}${initialList}${end}${purple} -->${end}${green} ${entryRead}${end}" 
       initialList=$(expr ${initialList} + 1)
     done
-    rm -rf /tmp/dmenu_protonvpn-tmp
     echo ""
     echo -e " ${red}r${end}${purple} -->${end}${green} Return to menu (cancel)${end}"
     echo ""

menu/edit-pass-credential.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-################################################################
-# Script for manage your ProtonVPN connections (Dmenu VERSION) #
-# Last change: 29-05-2022                                      #
-# Author: q3aql                                                #
-# Contact: q3aql@duck.com                                      #
-# License: GPL v2.0                                            #
-################################################################
-VERSION="2.0"
-M_DATE="290522"
-
-file_credentials="/opt/dmenu_protonvpn/proton-credentials.txt"
-user_credentials="/opt/dmenu_protonvpn/proton-user.txt"
-pass_credentials="/opt/dmenu_protonvpn/proton-pass.txt"
-
-echo ""
-echo -n "* Password OpenVPN / IKEv2: " ; read pass_openvpn
-if [ -z "${pass_openvpn}" ] ; then
-  echo "# Pass canceled"
-else
-  echo "${pass_openvpn}" > ${pass_credentials}
-fi

menu/edit-user-credential.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-################################################################
-# Script for manage your ProtonVPN connections (Dmenu VERSION) #
-# Last change: 29-05-2022                                      #
-# Author: q3aql                                                #
-# Contact: q3aql@duck.com                                      #
-# License: GPL v2.0                                            #
-################################################################
-VERSION="2.0"
-M_DATE="290522"
-
-file_credentials="/opt/dmenu_protonvpn/proton-credentials.txt"
-user_credentials="/opt/dmenu_protonvpn/proton-user.txt"
-pass_credentials="/opt/dmenu_protonvpn/proton-pass.txt"
-
-echo ""
-echo -n "* User OpenVPN / IKEv2: " ; read user_openvpn
-if [ -z "${user_openvpn}" ] ; then
-  echo "# User canceled"
-else
-  echo "${user_openvpn}" > ${user_credentials}
-fi