Compare commits

...

8 Commits

Author SHA1 Message Date
4786cd3e2e url update fix 2024-07-28 20:21:30 +02:00
0751417431 url update 2024-07-28 20:18:20 +02:00
0b112d1fa5 readme update2
path to images update2
2024-06-22 09:43:25 +02:00
2de053f7eb readme update
path to images updates
2024-06-22 09:30:13 +02:00
e342a720bf translate update 2023-11-30 12:41:42 +01:00
3823c8d849 fix fi 2023-11-30 12:33:39 +01:00
8e21d06877 ping remove 2023-11-30 12:31:41 +01:00
5381f50258 CHANGLOG test a exist or not exist 2023-11-30 12:15:41 +01:00
13 changed files with 84 additions and 47 deletions

3
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

8
.idea/Wire-G.iml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

4
.idea/misc.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" project-jdk-type="Python SDK" />
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Wire-G.iml" filepath="$PROJECT_DIR$/.idea/Wire-G.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -1,3 +0,0 @@
{
"openInGitHub.providerType": "gitea"
}

View File

@ -4,7 +4,7 @@ Wire-G eine GUI App für Linux Systeme in Bash mit yad. Einfaches Management von
# Screenshots # Screenshots
[![BWire-G-sammlung.png](https://nc.lunix.dedyn.io/s/BaYmDeSnGFaA9Xr/preview)](https://nc.lunix.dedyn.io/s/BaYmDeSnGFaA9Xr) [![BWire-G-sammlung.png](https://fb.ilunix.de/api/public/dl/QoKzjRyN/Wire-G-sammlung.png?inline=true)](https://fb.ilunix.de/share/QoKzjRyN)
[![Wire-G8.png](https://nc.lunix.dedyn.io/s/mMYT7gqX8s7TfBK/preview)](https://nc.lunix.dedyn.io/s/mMYT7gqX8s7TfBK) [![Wire-G8.png](https://fb.ilunix.de/api/public/dl/QoKzjRyN/Wire-G8.png?inline=true)](https://fb.ilunix.de/share/QoKzjRyN)
[![Wire-G5.png](https://nc.lunix.dedyn.io/s/tmEsS8sfZd4GASc/preview)](https://nc.lunix.dedyn.io/s/YmKG2aWYxYpyZie) [![Wire-G5.png](https://fb.ilunix.de/api/public/dl/QoKzjRyN/Wire-G5.png?inline=true)](https://fb.ilunix.de/share/QoKzjRyN)
[![Wire-G6.png](https://nc.lunix.dedyn.io/s/2iwkMNHMkeDTxQi/preview)](https://nc.lunix.dedyn.io/s/2iwkMNHMkeDTxQi) [![Wire-G6.png](https://fb.ilunix.de/api/public/dl/QoKzjRyN/Wire-G6.png?inline=true)](https://fb.ilunix.de/share/QoKzjRyN)

Binary file not shown.

View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-29 21:10+0100\n" "POT-Creation-Date: 2023-11-30 12:36+0100\n"
"PO-Revision-Date: 2023-11-29 21:49+0100\n" "PO-Revision-Date: 2023-11-30 12:40+0100\n"
"Last-Translator: punix <polunga40@unity-mail.de>\n" "Last-Translator: punix <polunga40@unity-mail.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n" "Language: de\n"
@ -134,7 +134,7 @@ msgstr ""
"<a href='https://git.lunix.dedyn.io/punix/Wire-G/releases'>Download Wire-G </" "<a href='https://git.lunix.dedyn.io/punix/Wire-G/releases'>Download Wire-G </"
"a> \\n" "a> \\n"
#: /home/punix/VSCodium/Wire-G/wire_g:341 #: /home/punix/VSCodium/Wire-G/wire_g:342
msgid "" msgid ""
"<span>Update for Wireg-G is available.</span> \\n \n" "<span>Update for Wireg-G is available.</span> \\n \n"
"<a href='https://git.lunix.dedyn.io/punix/Wire-G'>Download Wire-G </a> \\n" "<a href='https://git.lunix.dedyn.io/punix/Wire-G'>Download Wire-G </a> \\n"
@ -142,31 +142,31 @@ msgstr ""
"<span>Update für Wireg-G ist verfügbar.</span> \\n \n" "<span>Update für Wireg-G ist verfügbar.</span> \\n \n"
"<a href='https://git.lunix.dedyn.io/punix/Wire-G'>Download Wire-G </a> \\n" "<a href='https://git.lunix.dedyn.io/punix/Wire-G'>Download Wire-G </a> \\n"
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Start:0" msgid "Start:0"
msgstr "Start:0" msgstr "Start:0"
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Stop:2" msgid "Stop:2"
msgstr "Stop:2" msgstr "Stop:2"
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Import:3" msgid "Import:3"
msgstr "Importieren:3" msgstr "Importieren:3"
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Remove:4" msgid "Remove:4"
msgstr "Entfernen:4" msgstr "Entfernen:4"
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "About:5" msgid "About:5"
msgstr "Über:5" msgstr "Über:5"
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Selection" msgid "Selection"
msgstr "Auswahl" msgstr "Auswahl"
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "" msgid ""
"<b>Activ Tunnel: </b> <span color='#0fad0a'><b>$ACTIVE</b></span> \n" "<b>Activ Tunnel: </b> <span color='#0fad0a'><b>$ACTIVE</b></span> \n"
"<b>-----------------------------------------------------------------------------------------------------" "<b>-----------------------------------------------------------------------------------------------------"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-29 21:10+0100\n" "POT-Creation-Date: 2023-11-30 12:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -109,37 +109,37 @@ msgid ""
"a> \\n" "a> \\n"
msgstr "" msgstr ""
#: /home/punix/VSCodium/Wire-G/wire_g:341 #: /home/punix/VSCodium/Wire-G/wire_g:342
msgid "" msgid ""
"<span>Update for Wireg-G is available.</span> \\n \n" "<span>Update for Wireg-G is available.</span> \\n \n"
"<a href='https://git.lunix.dedyn.io/punix/Wire-G'>Download Wire-G </a> \\n" "<a href='https://git.lunix.dedyn.io/punix/Wire-G'>Download Wire-G </a> \\n"
msgstr "" msgstr ""
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Start:0" msgid "Start:0"
msgstr "" msgstr ""
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Stop:2" msgid "Stop:2"
msgstr "" msgstr ""
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Import:3" msgid "Import:3"
msgstr "" msgstr ""
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Remove:4" msgid "Remove:4"
msgstr "" msgstr ""
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "About:5" msgid "About:5"
msgstr "" msgstr ""
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "Selection" msgid "Selection"
msgstr "" msgstr ""
#: /home/punix/VSCodium/Wire-G/wire_g:346 #: /home/punix/VSCodium/Wire-G/wire_g:348
msgid "" msgid ""
"<b>Activ Tunnel: </b> <span color='#0fad0a'><b>$ACTIVE</b></span> \n" "<b>Activ Tunnel: </b> <span color='#0fad0a'><b>$ACTIVE</b></span> \n"
"<b>-----------------------------------------------------------------------------------------------------" "<b>-----------------------------------------------------------------------------------------------------"

View File

@ -8,14 +8,17 @@
# Use without warranty! ## # Use without warranty! ##
######################################################## ########################################################
######################################################## ########################################################
-30.11.2023-
[3.2.1]
CHANGLOG test a exist or not exist
add ping -c 1 git.lunix.dedyn.io
translate new update
-------------------------------------------------------- --------------------------------------------------------
-29.11.2023- -29.11.2023-
[3.2.0] [3.2.0]
fix on start when active Tunnel removed fix on start when active Tunnel removed
new messeage window when active tunnel removed new messeage window when active tunnel removed
update translate update translate
new message on background
-------------------------------------------------------- --------------------------------------------------------
-29.11.2023- -29.11.2023-
[3.1.9] [3.1.9]

16
wire_g
View File

@ -19,7 +19,7 @@ export TEXTDOMAINDIR="/usr/share/locale"
############################################################################################################ ############################################################################################################
############################################################################################################ ############################################################################################################
VERSION=3.2.0 VERSION=3.2.1
# wg_workdir Arbeitsverzeichnis wg # wg_workdir Arbeitsverzeichnis wg
WG_WDIR="/home/$USER/.config/wg_nmcli/" WG_WDIR="/home/$USER/.config/wg_nmcli/"
# Pfad wg Icons # Pfad wg Icons
@ -240,7 +240,7 @@ about(){
<span color='#626ff1'><b>At all Tunnels, the auto start is disabled.</b></span> \n <span color='#626ff1'><b>At all Tunnels, the auto start is disabled.</b></span> \n
<span color='#626ff1'><b>Version: $VERSION </b></span> \n <span color='#626ff1'><b>Version: $VERSION </b></span> \n
<span color='#626ff1'><b>Use without warranty.</b></span> \n <span color='#626ff1'><b>Use without warranty.</b></span> \n
<a href='https://git.lunix.dedyn.io/punix/Wire-G/releases'>Download Wire-G </a> \n" &> ${WG_WDIR}about.txt <a href='https://git.ilunix.de/punix/Wire-G/releases'>Download Wire-G </a> \n" &> ${WG_WDIR}about.txt
on_start on_start
@ -258,7 +258,7 @@ about(){
<span color='#626ff1'><b>At all Tunnels, the auto start is disabled.</b></span> \n <span color='#626ff1'><b>At all Tunnels, the auto start is disabled.</b></span> \n
<span color='#626ff1'><b>Version: $VERSION </b></span> \n <span color='#626ff1'><b>Version: $VERSION </b></span> \n
<span color='#626ff1'><b>Use without warranty.</b></span> \n <span color='#626ff1'><b>Use without warranty.</b></span> \n
<a href='https://git.lunix.dedyn.io/punix/Wire-G/releases'>Download Wire-G </a> \n" &> ${WG_WDIR}about.txt <a href='https://git.ilunix.de/punix/Wire-G/releases'>Download Wire-G </a> \n" &> ${WG_WDIR}about.txt
on_start on_start
@ -276,7 +276,7 @@ about(){
<span color='#626ff1'><b>At all Tunnels, the auto start is disabled.</b></span> \n <span color='#626ff1'><b>At all Tunnels, the auto start is disabled.</b></span> \n
<span color='#626ff1'><b>Version: $VERSION </b></span> \n <span color='#626ff1'><b>Version: $VERSION </b></span> \n
<span color='#626ff1'><b>Use without warranty.</b></span> \n <span color='#626ff1'><b>Use without warranty.</b></span> \n
<a href='https://git.lunix.dedyn.io/punix/Wire-G/releases'>Download Wire-G </a> \n" &> ${WG_WDIR}about.txt <a href='https://git.ilunix.de/punix/Wire-G/releases'>Download Wire-G </a> \n" &> ${WG_WDIR}about.txt
on_start on_start
@ -294,7 +294,7 @@ about(){
<span color='#626ff1'><b>At all Tunnels, the auto start is disabled.</b></span> \n <span color='#626ff1'><b>At all Tunnels, the auto start is disabled.</b></span> \n
<span color='#626ff1'><b>Version: $VERSION </b></span> \n <span color='#626ff1'><b>Version: $VERSION </b></span> \n
<span color='#626ff1'><b>Use without warranty.</b></span> \n <span color='#626ff1'><b>Use without warranty.</b></span> \n
<a href='https://git.lunix.dedyn.io/punix/Wire-G/releases'>Download Wire-G </a> \n" &> ${WG_WDIR}about.txt <a href='https://git.ilunix.de/punix/Wire-G/releases'>Download Wire-G </a> \n" &> ${WG_WDIR}about.txt
on_start on_start
@ -326,7 +326,8 @@ fi
#Search on Updates #Search on Updates
if AUTOUPDATE=$(grep 'TRUE TRUE\|FALSE TRUE' ${WG_WDIR}about.txt) if AUTOUPDATE=$(grep 'TRUE TRUE\|FALSE TRUE' ${WG_WDIR}about.txt)
then then
rm /tmp/CHANGELOG &> /dev/null if [[ ! -e /tmp/CHANGELOG ]]
then
wget https://git.lunix.dedyn.io/punix/Wire-G/raw/branch/main/wg_nmcli/CHANGELOG -P /tmp wget https://git.lunix.dedyn.io/punix/Wire-G/raw/branch/main/wg_nmcli/CHANGELOG -P /tmp
UPDATE=$(diff -q /home/"$USER"/.local/share/wg_nmcli/CHANGELOG /tmp/CHANGELOG) UPDATE=$(diff -q /home/"$USER"/.local/share/wg_nmcli/CHANGELOG /tmp/CHANGELOG)
@ -339,7 +340,8 @@ if AUTOUPDATE=$(grep 'TRUE TRUE\|FALSE TRUE' ${WG_WDIR}about.txt)
--image-on-top --image=${WG_PIC}wg-vpn-info.png \ --image-on-top --image=${WG_PIC}wg-vpn-info.png \
--separator=" " --skip-taskbar \ --separator=" " --skip-taskbar \
--text=$"<span>Update for Wireg-G is available.</span> \n --text=$"<span>Update for Wireg-G is available.</span> \n
<a href='https://git.lunix.dedyn.io/punix/Wire-G'>Download Wire-G </a> \n" <a href='https://git.ilunix.de/punix/Wire-G'>Download Wire-G </a> \n"
fi
fi fi
fi fi
#Here is start Wire-G #Here is start Wire-G