diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c290777..ec2ac1e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,9 @@
-
+
-
-
@@ -417,7 +415,15 @@
1726652747322
-
+
+
+ 1726691611936
+
+
+
+ 1726691611936
+
+
@@ -458,7 +464,6 @@
-
@@ -483,7 +488,8 @@
-
+
+
@@ -493,11 +499,6 @@
1
-
- file://$PROJECT_DIR$/wg_func.py
- 11
-
-
diff --git a/install b/install
index 7e56afc..1e60aa3 100755
--- a/install
+++ b/install
@@ -4,28 +4,22 @@ which sudo >/dev/null
if [ $? -ne 0 ]
then
su -
- apt install python3-tk -y && apt install tcl-ttkthemes -y && \
+ apt install python3-tk -y && \
cp wg_main.py start_wg.py wg_func.py wirepy /usr/bin/ && \
mkdir -p /etc/wire_py && cp -R wp-icons /usr/share/icons/ && \
- chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
- if [ ! -f /usr/local/bin/wirepy ]
- then
- ln -s /usr/bin/wirepy.py /usr/local/bin/wirepy >/dev/null
- fi
+ chown -R root:root /etc/wire_py && chmod 755 /etc/wire_py && \
+ ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy >/dev/null && \
cp org.wirepy.policy /usr/share/polkit-1/actions/ && \
cp Wire-Py.desktop /usr/share/applications/ && \
cp wg_start.services /lib/systemd/system/ && \
systemctl enable wg_start.service
else
- sudo apt install python3-tk && sudo apt install tcl-ttkthemes && \
+ sudo apt install python3-tk && \
sudo cp wg_main.py start_wg.py wg_func.py wirepy /usr/bin/ && \
sudo mkdir -p /etc/wire_py && sudo cp -R wp-icons /usr/share/icons/ && \
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
- if [ ! -f /usr/local/bin/wirepy ]
- then
- sudo ln -s /usr/bin/wirepy.py /usr/local/bin/wirepy
- fi
+ sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
sudo cp org.wirepy.policy /usr/share/polkit-1/actions/ && \
sudo cp Wire-Py.desktop /usr/share/applications/ && \
sudo cp wg_start.service /lib/systemd/system/ && \
diff --git a/wg_func.py b/wg_func.py
index 37a51b5..9d752bc 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -184,7 +184,7 @@ class ImportTunnel:
filepath = filedialog.askopenfilename(initialdir=Path('/home/'), title='Select Wireguard config '
'File',
filetypes=[('WG config files', '*.conf')], )
- os.chmod(filepath, 0o600)
+
with open(filepath, 'r') as file:
read = file.read()
path_split = filepath.split('/')
@@ -224,7 +224,7 @@ class ImportTunnel:
ShowAddress.init_and_report(self, data)
ShowAddress.show_data(self)
check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
-
+ os.chmod(str(wg_read), 0o600)
if 'PrivateKey = ' not in read:
msg_window()
except EOFError: