bash-script-maker 1.8.0__tar.gz → 1.11.0__tar.gz

{bash-script-maker-1.8.0/bash_script_maker.egg-info → bash-script-maker-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bash-script-maker
-Version: 1.8.0
+Version: 1.11.0
 Summary: Ein GUI-Programm zur Erstellung von Bash-Scripts mit visueller Unterstützung
 Home-page: https://github.com/securebitsorg/bash-script-maker
 Author: Marcel Dellmann

bash-script-maker-1.11.0/VERSION

@@ -0,0 +1 @@
+1.11.0

{bash-script-maker-1.8.0 → bash-script-maker-1.11.0}/__version__.py

@@ -4,5 +4,5 @@
 Version information for Bash-Script-Maker
 """
 
-__version__ = "1.8.0"
-__version_info__ = (1, 8, 0)
+__version__ = "1.11.0"
+__version_info__ = (1, 11, 0)

{bash-script-maker-1.8.0 → bash-script-maker-1.11.0/bash_script_maker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bash-script-maker
-Version: 1.8.0
+Version: 1.11.0
 Summary: Ein GUI-Programm zur Erstellung von Bash-Scripts mit visueller Unterstützung
 Home-page: https://github.com/securebitsorg/bash-script-maker
 Author: Marcel Dellmann

{bash-script-maker-1.8.0 → bash-script-maker-1.11.0}/bash_script_maker.py

@@ -4,10 +4,66 @@
 Bash-Script-Maker - Ein GUI-Programm zur Erstellung von Bash-Scripts
 """
 
-try:
-    from __version__ import __version__
-except ImportError:
-    __version__ = "1.2.1"
+
+def get_version():
+    """Ermittelt die aktuelle Version dynamisch"""
+    import os
+
+    # 1. Versuche __version__.py zu importieren
+    try:
+        from __version__ import __version__
+
+        return __version__
+    except ImportError:
+        pass
+
+    # 2. Versuche VERSION Datei zu lesen
+    try:
+        script_dir = os.path.dirname(os.path.abspath(__file__))
+        version_file = os.path.join(script_dir, "VERSION")
+        if os.path.exists(version_file):
+            with open(version_file, "r", encoding="utf-8") as f:
+                return f.read().strip()
+    except Exception:
+        pass
+
+    # 3. Versuche pyproject.toml zu parsen
+    try:
+        script_dir = os.path.dirname(os.path.abspath(__file__))
+        pyproject_file = os.path.join(script_dir, "pyproject.toml")
+        if os.path.exists(pyproject_file):
+            with open(pyproject_file, "r", encoding="utf-8") as f:
+                content = f.read()
+                import re
+
+                match = re.search(r'version\s*=\s*"([^"]+)"', content)
+                if match:
+                    return match.group(1)
+    except Exception:
+        pass
+
+    # 4. Versuche Git-Tag zu ermitteln (falls in Git-Repository)
+    try:
+        import subprocess
+
+        result = subprocess.run(
+            ["git", "describe", "--tags", "--abbrev=0"],
+            capture_output=True,
+            text=True,
+            cwd=os.path.dirname(os.path.abspath(__file__)),
+        )
+        if result.returncode == 0:
+            tag = result.stdout.strip()
+            # Entferne 'v' Präfix falls vorhanden
+            return tag.lstrip("v")
+    except Exception:
+        pass
+
+    # 5. Fallback
+    return "1.9.0"
+
+
+__version__ = get_version()
 
 import tkinter as tk
 from tkinter import scrolledtext, messagebox
@@ -134,7 +190,7 @@ class AboutDialog(ttk.Toplevel):
         # Logo und Titel-Bereich
         header_frame = ttk.Frame(container)
         header_frame.pack(fill=tk.X, pady=(0, 20))
-        
+
         # Logo hinzufügen
         self.add_logo_to_header(header_frame)
 
@@ -192,10 +248,7 @@ class AboutDialog(ttk.Toplevel):
 
         # Schließen-Button
         close_btn = ttk.Button(
-            container, 
-            text=_("Schließen"), 
-            command=self.destroy, 
-            bootstyle="primary"
+            container, text=_("Schließen"), command=self.destroy, bootstyle="primary"
         )
         close_btn.pack(pady=(20, 0))
 
@@ -204,36 +257,28 @@ class AboutDialog(ttk.Toplevel):
         try:
             script_dir = os.path.dirname(os.path.abspath(__file__))
             logo_path = os.path.join(script_dir, "assets", "bash-script-maker-64.png")
-            
+
             if os.path.exists(logo_path):
                 try:
                     from PIL import Image, ImageTk
-                    
+
                     # Logo für About-Dialog (64x64)
                     img = Image.open(logo_path)
                     logo_photo = ImageTk.PhotoImage(img)
-                    
+
                     logo_label = ttk.Label(header_frame, image=logo_photo)
                     logo_label.image = logo_photo  # Referenz behalten
                     logo_label.pack(anchor=tk.CENTER)
-                    
+
                 except ImportError:
                     # Fallback: Großes Emoji
-                    logo_label = ttk.Label(
-                        header_frame, 
-                        text="🖥️", 
-                        font=("Arial", 48)
-                    )
+                    logo_label = ttk.Label(header_frame, text="🖥️", font=("Arial", 48))
                     logo_label.pack(anchor=tk.CENTER)
             else:
                 # Fallback: Emoji
-                logo_label = ttk.Label(
-                    header_frame, 
-                    text="🖥️", 
-                    font=("Arial", 48)
-                )
+                logo_label = ttk.Label(header_frame, text="🖥️", font=("Arial", 48))
                 logo_label.pack(anchor=tk.CENTER)
-                
+
         except Exception as e:
             print(f"Fehler beim Hinzufügen des Logos zum About-Dialog: {e}")
             # Minimaler Fallback
@@ -392,112 +437,193 @@ class BashScriptMaker:
             # Logo-Container für bessere Anordnung
             logo_container = ttk.Frame(toolbar)
             logo_container.pack(side=tk.LEFT, padx=(0, 20), pady=15)
-            
+
             # Pfad zum Icon ermitteln
             script_dir = os.path.dirname(os.path.abspath(__file__))
             logo_path = os.path.join(script_dir, "assets", "bash-script-maker-48.png")
-            
+
             if os.path.exists(logo_path):
                 try:
                     from PIL import Image, ImageTk
-                    
+
                     # Logo laden - größer für bessere Sichtbarkeit
                     img = Image.open(logo_path)
                     # Optimale Größe für Toolbar (36x36)
                     img = img.resize((36, 36), Image.Resampling.LANCZOS)
                     logo_photo = ImageTk.PhotoImage(img)
-                    
+
                     # Logo-Label erstellen
                     logo_label = ttk.Label(logo_container, image=logo_photo)
                     logo_label.image = logo_photo  # Referenz behalten
                     logo_label.pack(side=tk.LEFT, padx=(0, 8))
-                    
+
                     # App-Name-Label hinzufügen
                     name_label = ttk.Label(
-                        logo_container, 
-                        text="Bash-Script-Maker", 
+                        logo_container,
+                        text="Bash-Script-Maker",
                         font=("Arial", 12, "bold"),
-                        foreground="#2c3e50"  # Dunkle Farbe für bessere Lesbarkeit
+                        foreground="#2c3e50",  # Dunkle Farbe für bessere Lesbarkeit
                     )
                     name_label.pack(side=tk.LEFT, anchor=tk.CENTER)
-                    
+
                     # Version-Label (kleiner) hinzufügen
                     version_label = ttk.Label(
-                        logo_container, 
-                        text=f"v{__version__}", 
+                        logo_container,
+                        text=f"v{__version__}",
                         font=("Arial", 9),
-                        foreground="#7f8c8d"  # Grau für subtile Version
+                        foreground="#7f8c8d",  # Grau für subtile Version
                     )
                     version_label.pack(side=tk.LEFT, padx=(5, 0), anchor=tk.CENTER)
-                    
+
                     # Tooltips hinzufügen
                     ToolTip(logo_label, text=f"Bash-Script-Maker v{__version__}")
                     ToolTip(name_label, text=f"Bash-Script-Maker v{__version__}")
                     ToolTip(version_label, text=f"Version {__version__}")
-                    
+
                     print("Logo und App-Name zur Toolbar hinzugefügt")
-                    
+
                 except ImportError:
                     # Fallback ohne PIL - verwende Text-Logo mit Name
-                    logo_label = ttk.Label(
-                        logo_container, 
-                        text="🖥️", 
-                        font=("Arial", 24)
-                    )
+                    logo_label = ttk.Label(logo_container, text="🖥️", font=("Arial", 24))
                     logo_label.pack(side=tk.LEFT, padx=(0, 8))
-                    
+
                     # App-Name auch im Fallback
                     name_label = ttk.Label(
-                        logo_container, 
-                        text="Bash-Script-Maker", 
-                        font=("Arial", 12, "bold")
+                        logo_container,
+                        text="Bash-Script-Maker",
+                        font=("Arial", 12, "bold"),
                     )
                     name_label.pack(side=tk.LEFT, anchor=tk.CENTER)
-                    
+
                     version_label = ttk.Label(
-                        logo_container, 
-                        text=f"v{__version__}", 
-                        font=("Arial", 9)
+                        logo_container, text=f"v{__version__}", font=("Arial", 9)
                     )
                     version_label.pack(side=tk.LEFT, padx=(5, 0), anchor=tk.CENTER)
-                    
+
                     # Tooltips
                     ToolTip(logo_label, text=f"Bash-Script-Maker v{__version__}")
                     ToolTip(name_label, text=f"Bash-Script-Maker v{__version__}")
                     ToolTip(version_label, text=f"Version {__version__}")
-                    
+
                     print("Text-Logo und App-Name zur Toolbar hinzugefügt")
-                    
+
             else:
                 # Nur Text-Branding wenn kein Icon gefunden
                 name_label = ttk.Label(
-                    logo_container, 
-                    text="🖥️ Bash-Script-Maker", 
-                    font=("Arial", 12, "bold")
+                    logo_container,
+                    text="🖥️ Bash-Script-Maker",
+                    font=("Arial", 12, "bold"),
                 )
                 name_label.pack(side=tk.LEFT)
-                
+
                 version_label = ttk.Label(
-                    logo_container, 
-                    text=f"v{__version__}", 
-                    font=("Arial", 9)
+                    logo_container, text=f"v{__version__}", font=("Arial", 9)
                 )
                 version_label.pack(side=tk.LEFT, padx=(5, 0), anchor=tk.CENTER)
-                
+
                 ToolTip(name_label, text=f"Bash-Script-Maker v{__version__}")
                 ToolTip(version_label, text=f"Version {__version__}")
-                
+
                 print(f"Logo-Datei nicht gefunden: {logo_path}, verwende Text-Branding")
-                
+
         except Exception as e:
             print(f"Fehler beim Hinzufügen des Logos: {e}")
             # Minimaler Fallback
             try:
-                fallback_label = ttk.Label(toolbar, text="Bash-Script-Maker", font=("Arial", 10, "bold"))
+                fallback_label = ttk.Label(
+                    toolbar, text="Bash-Script-Maker", font=("Arial", 10, "bold")
+                )
                 fallback_label.pack(side=tk.LEFT, padx=(0, 15), pady=20)
             except:
                 pass
 
+    def create_header(self):
+        """Erstellt den Header-Bereich mit Logo, App-Titel und Version"""
+        header_frame = ttk.Frame(self.root, bootstyle="primary")
+        header_frame.pack(side=tk.TOP, fill=tk.X, padx=5, pady=(5, 10))
+
+        # Header-Container für bessere Kontrolle
+        header_container = ttk.Frame(header_frame)
+        header_container.pack(fill=tk.X, padx=15, pady=10)
+
+        # Logo (links)
+        logo_frame = ttk.Frame(header_container)
+        logo_frame.pack(side=tk.LEFT)
+
+        try:
+            script_dir = os.path.dirname(os.path.abspath(__file__))
+            logo_path = os.path.join(script_dir, "assets", "bash-script-maker-48.png")
+
+            if os.path.exists(logo_path):
+                try:
+                    from PIL import Image, ImageTk
+
+                    # Logo für Header (48x48)
+                    img = Image.open(logo_path)
+                    logo_photo = ImageTk.PhotoImage(img)
+
+                    logo_label = ttk.Label(logo_frame, image=logo_photo)
+                    logo_label.image = logo_photo  # Referenz behalten
+                    logo_label.pack(side=tk.LEFT, padx=(0, 15))
+
+                except ImportError:
+                    # Fallback: Großes Emoji
+                    logo_label = ttk.Label(logo_frame, text="🖥️", font=("Arial", 36))
+                    logo_label.pack(side=tk.LEFT, padx=(0, 15))
+            else:
+                # Fallback: Emoji
+                logo_label = ttk.Label(logo_frame, text="🖥️", font=("Arial", 36))
+                logo_label.pack(side=tk.LEFT, padx=(0, 15))
+
+        except Exception as e:
+            print(f"Fehler beim Laden des Header-Logos: {e}")
+            # Minimaler Fallback
+            logo_label = ttk.Label(logo_frame, text="🖥️", font=("Arial", 24))
+            logo_label.pack(side=tk.LEFT, padx=(0, 15))
+
+        # Titel und Version (mittig-links)
+        title_frame = ttk.Frame(header_container)
+        title_frame.pack(side=tk.LEFT, fill=tk.X, expand=True)
+
+        # Haupttitel
+        title_label = ttk.Label(
+            title_frame,
+            text="Bash-Script-Maker",
+            font=("Arial", 24, "bold"),
+            bootstyle="inverse-primary",
+        )
+        title_label.pack(anchor=tk.W)
+
+        # Untertitel mit Version
+        subtitle_label = ttk.Label(
+            title_frame,
+            text=f"Version {__version__} - Professioneller Bash-Script-Generator",
+            font=("Arial", 11),
+            bootstyle="inverse-secondary",
+        )
+        subtitle_label.pack(anchor=tk.W, pady=(2, 0))
+
+        # Status-Info (rechts)
+        status_frame = ttk.Frame(header_container)
+        status_frame.pack(side=tk.RIGHT)
+
+        # Aktuelle Zeit/Datum als zusätzliche Info
+        import datetime
+
+        current_time = datetime.datetime.now().strftime("%d.%m.%Y")
+
+        info_label = ttk.Label(
+            status_frame,
+            text=f"Gestartet: {current_time}",
+            font=("Arial", 9),
+            bootstyle="inverse-secondary",
+        )
+        info_label.pack(anchor=tk.E)
+
+        # Separator-Linie unter dem Header
+        separator = ttk.Separator(self.root, orient=tk.HORIZONTAL)
+        separator.pack(side=tk.TOP, fill=tk.X, padx=5)
+
     def create_menu(self):
         """Erstellt das Menü der Anwendung"""
         menubar = tk.Menu(self.root)
@@ -618,12 +744,12 @@ class BashScriptMaker:
         )
         status_bar.pack(side=tk.BOTTOM, fill=tk.X)
 
-        # Toolbar ganz oben platzieren
-        toolbar = ttk.Frame(self.root)
-        toolbar.pack(side=tk.TOP, fill=tk.X, padx=5, pady=(5, 0))
+        # Header-Bereich für App-Titel und Logo
+        self.create_header()
 
-        # Logo hinzufügen (links)
-        self.add_logo_to_toolbar(toolbar)
+        # Toolbar für Buttons
+        toolbar = ttk.Frame(self.root)
+        toolbar.pack(side=tk.TOP, fill=tk.X, padx=5, pady=(0, 0))
 
         # Toolbar-Inhalte - LINKS
         btn_new = ttk.Button(

{bash-script-maker-1.8.0 → bash-script-maker-1.11.0}/install.sh

@@ -304,7 +304,7 @@ if main_installation; then
 Name=Bash-Script-Maker
 Comment=Ein GUI-Programm zur Erstellung von Bash-Scripts
 Exec=$HOME/.local/bin/bash-script-maker
-Icon=$HOME/.local/share/icons/hicolor/scalable/apps/bash-script-maker.svg
+Icon=bash-script-maker
 Terminal=false
 Type=Application
 Categories=Development;Utility;TextEditor;

{bash-script-maker-1.8.0 → bash-script-maker-1.11.0}/install_apt.sh

@@ -170,7 +170,7 @@ if [ -f "bash-script-maker.desktop" ] && [ -f "assets/bash-script-maker.svg" ];
 Name=Bash-Script-Maker
 Comment=Ein GUI-Programm zur Erstellung von Bash-Scripts
 Exec=$HOME/.local/bin/bash-script-maker
-Icon=$HOME/.local/share/icons/hicolor/scalable/apps/bash-script-maker.svg
+Icon=bash-script-maker
 Terminal=false
 Type=Application
 Categories=Development;Utility;TextEditor;

{bash-script-maker-1.8.0 → bash-script-maker-1.11.0}/install_desktop_integration.sh

@@ -49,7 +49,7 @@ if cat > ~/.local/share/applications/bash-script-maker.desktop << EOF
 Name=Bash-Script-Maker
 Comment=Ein GUI-Programm zur Erstellung von Bash-Scripts
 Exec=$HOME/.local/bin/bash-script-maker
-Icon=$HOME/.local/share/icons/hicolor/scalable/apps/bash-script-maker.svg
+Icon=bash-script-maker
 Terminal=false
 Type=Application
 Categories=Development;Utility;TextEditor;

{bash-script-maker-1.8.0 → bash-script-maker-1.11.0}/install_dnf.sh

@@ -163,7 +163,7 @@ if [ -f "bash-script-maker.desktop" ] && [ -f "assets/bash-script-maker.svg" ];
 Name=Bash-Script-Maker
 Comment=Ein GUI-Programm zur Erstellung von Bash-Scripts
 Exec=$HOME/.local/bin/bash-script-maker
-Icon=$HOME/.local/share/icons/hicolor/scalable/apps/bash-script-maker.svg
+Icon=bash-script-maker
 Terminal=false
 Type=Application
 Categories=Development;Utility;TextEditor;

{bash-script-maker-1.8.0 → bash-script-maker-1.11.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bash-script-maker"
-version = "1.8.0"
+version = "1.11.0"
 description = "Ein GUI-Programm zur Erstellung von Bash-Scripts mit visueller Unterstützung"
 readme = "README.md"
 license = {text = "MIT"}

bash-script-maker-1.8.0/VERSION

@@ -1 +0,0 @@
-1.8.0