From b633fac5a0b12bd157ff4b8c918350d4a813b8cb Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Thu, 19 Sep 2024 20:30:01 +0200
Subject: [PATCH] install rollback bash to py wirepy and wirepy rollback to py

---
 .idea/workspace.xml | 61 +++++++++++++++++++++------------------------
 install             |  8 +++---
 wg_func.py          |  2 +-
 wirepy              |  3 ---
 wirepy.py           |  6 +++++
 5 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100755 wirepy
 create mode 100755 wirepy.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f84c990..6c172c0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="fix set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open">
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="fix a filedialog for hidden Files work&#10;install rollback to bash for start wirepy and wirepy rollback to bash">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/install" beforeDir="false" afterPath="$PROJECT_DIR$/install" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wirepy" beforeDir="false" afterPath="$PROJECT_DIR$/wirepy" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wirepy" beforeDir="false" afterPath="$PROJECT_DIR$/wirepy.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -42,23 +42,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;Python.INSTALL.executor&quot;: &quot;Run&quot;,
-    &quot;Python.install.executor&quot;: &quot;Run&quot;,
-    &quot;Python.main.executor&quot;: &quot;Run&quot;,
-    &quot;Python.messagebox.executor&quot;: &quot;Run&quot;,
-    &quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
-    &quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
-    &quot;Python.wg_main.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;Shell Script.install.executor&quot;: &quot;Run&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/filebrowserhiddenfiles&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.fileTypes&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "Python.INSTALL.executor": "Run",
+    "Python.install.executor": "Run",
+    "Python.main.executor": "Run",
+    "Python.messagebox.executor": "Run",
+    "Python.start_wg.executor": "Run",
+    "Python.wg_func.executor": "Run",
+    "Python.wg_main.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "Shell Script.install.executor": "Run",
+    "git-widget-placeholder": "main",
+    "last_opened_file_path": "/home/punix/Pyapps/wire-py",
+    "settings.editor.selected.configurable": "preferences.fileTypes"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
@@ -431,7 +431,15 @@
       <option name="project" value="LOCAL" />
       <updated>1726734843529</updated>
     </task>
-    <option name="localTasksCounter" value="38" />
+    <task id="LOCAL-00038" summary="fix a filedialog for hidden Files work&#10;install rollback to bash for start wirepy and wirepy rollback to bash">
+      <option name="closed" value="true" />
+      <created>1726764877546</created>
+      <option name="number" value="00038" />
+      <option name="presentableId" value="LOCAL-00038" />
+      <option name="project" value="LOCAL" />
+      <updated>1726764877546</updated>
+    </task>
+    <option name="localTasksCounter" value="39" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -472,7 +480,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="fixed error when active tunnel is deleted,&#10;now also the Address Label is emptied" />
     <MESSAGE value="In FrameWidged Class else Block StrVar, this resorts reference and variable assignment together" />
     <MESSAGE value="add method  init_and_report and label_empty to Class ShowAddress" />
     <MESSAGE value="little fixes in Class Import" />
@@ -497,17 +504,7 @@
     <MESSAGE value="fix rename in Messagebox warning to error" />
     <MESSAGE value="set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
     <MESSAGE value="fix set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/wg_main.py</url>
-          <line>1</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <MESSAGE value="fix a filedialog for hidden Files work&#10;install rollback to bash for start wirepy and wirepy rollback to bash" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix a filedialog for hidden Files work&#10;install rollback to bash for start wirepy and wirepy rollback to bash" />
   </component>
 </project>
\ No newline at end of file
diff --git a/install b/install
index 6c34953..7132419 100755
--- a/install
+++ b/install
@@ -5,10 +5,10 @@ if [ $? -ne 0 ]
   then
       su -
       apt install python3-tk -y && \
-      cp wg_main.py start_wg.py wg_func.py wirepy /usr/bin/ && \
+      cp wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
       mkdir -p /etc/wire_py && cp -R wp-icons /usr/share/icons/ && \
       chown -R root:root /etc/wire_py && chmod 755 /etc/wire_py && \
-      ln -sf /usr/bin/wirepy /usr/local/bin/wirepy >/dev/null && \
+      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/ && \
@@ -16,10 +16,10 @@ if [ $? -ne 0 ]
 
 else
     sudo apt install python3-tk && \
-    sudo cp wg_main.py start_wg.py wg_func.py wirepy /usr/bin/ && \
+    sudo cp wg_main.py start_wg.py wg_func.py wirepy.py /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 && \
-    sudo ln -sf /usr/bin/wirepy /usr/local/bin/wirepy && \
+    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 2e76d71..78aaace 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -299,7 +299,7 @@ class ExportTunnels:
         tl = ListTunnels.tl_list()
         try:
             if len(tl) != 0:
-                wg_tar = _u, now_datetime
+                wg_tar = '/home/' + str(_u) + now_datetime
                 p_to_conf = Path('/etc/wire_py/')
                 shutil.make_archive(wg_tar, 'zip', p_to_conf)
                 #if zip_full != 0:
diff --git a/wirepy b/wirepy
deleted file mode 100755
index b133bbe..0000000
--- a/wirepy
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-pkexec /usr/bin/wg_main.py
diff --git a/wirepy.py b/wirepy.py
new file mode 100755
index 0000000..bb3d616
--- /dev/null
+++ b/wirepy.py
@@ -0,0 +1,6 @@
+#!/bin/bash
+from subprocess import check_call
+from pathlib import Path
+
+Path.write_text(Path('/tmp/_u'), str(Path.home()))
+check_call(['pkexec', '/usr/bin/wg_main.py'])