Fix a double slash issue

ryzendew · ryzendew · commit c6e5f93a98ef · 2025-11-02T00:52:46.000-03:00
diff --git a/AffinityScripts/AffinityDesigner.sh b/AffinityScripts/AffinityDesigner.sh
@@ -566,6 +566,9 @@ print_step "Creating custom desktop entry..."
 desktop_file="$HOME/.local/share/applications/AffinityDesigner.desktop"
 mkdir -p "$HOME/.local/share/applications"
 
+# Normalize directory path (remove trailing slash if present)
+directory="${directory%/}"
+
 {
     echo "[Desktop Entry]"
     echo "Name=Affinity Designer"
diff --git a/AffinityScripts/AffinityLinuxInstaller.py b/AffinityScripts/AffinityLinuxInstaller.py
@@ -2166,14 +2166,20 @@ def create_custom_desktop_entry(self, installer_path, app_name):
         
         wine = Path(self.directory) / "ElementalWarriorWine" / "bin" / "wine"
         
+        # Normalize all paths to strings to avoid double slashes
+        wine_str = str(wine)
+        directory_str = str(self.directory).rstrip("/")  # Remove trailing slash if present
+        exe_path_normalized = exe_path.replace("\\", "/")  # Normalize Windows paths
+        
         with open(desktop_file, "w") as f:
             f.write("[Desktop Entry]\n")
             f.write(f"Name={app_name}\n")
             f.write(f"Comment={app_name} installed via Affinity Linux Installer\n")
             if icon_path:
-                f.write(f"Icon={icon_path}\n")
-            f.write(f"Path={self.directory}\n")
-            f.write(f'Exec=env WINEPREFIX={self.directory} {wine} "{exe_path}"\n')
+                icon_path_str = str(icon_path).rstrip("/")
+                f.write(f"Icon={icon_path_str}\n")
+            f.write(f"Path={directory_str}\n")
+            f.write(f'Exec=env WINEPREFIX={directory_str} {wine_str} "{exe_path_normalized}"\n')
             f.write("Terminal=false\n")
             f.write("Type=Application\n")
             f.write("Categories=Application;\n")
@@ -2517,13 +2523,19 @@ def create_desktop_entry(self, app_name):
         app_path = Path(self.directory) / "drive_c" / "Program Files" / "Affinity" / dir_name / exe
         icon_path = Path.home() / ".local" / "share" / "icons" / icon
         
+        # Normalize all paths to strings to avoid double slashes
+        wine_str = str(wine)
+        app_path_str = str(app_path).replace("\\", "/")  # Ensure forward slashes for Windows paths in Wine
+        directory_str = str(self.directory).rstrip("/")  # Remove trailing slash if present
+        icon_path_str = str(icon_path)
+        
         with open(desktop_file, "w") as f:
             f.write("[Desktop Entry]\n")
             f.write(f"Name=Affinity {name}\n")
             f.write(f"Comment=A powerful {name.lower()} software.\n")
-            f.write(f"Icon={icon_path}\n")
-            f.write(f"Path={self.directory}\n")
-            f.write(f'Exec=env WINEPREFIX={self.directory} {wine} "{app_path}"\n')
+            f.write(f"Icon={icon_path_str}\n")
+            f.write(f"Path={directory_str}\n")
+            f.write(f'Exec=env WINEPREFIX={directory_str} {wine_str} "{app_path_str}"\n')
             f.write("Terminal=false\n")
             f.write("Type=Application\n")
             f.write("Categories=Graphics;\n")
diff --git a/AffinityScripts/AffinityLinuxInstaller.sh b/AffinityScripts/AffinityLinuxInstaller.sh
@@ -656,13 +656,17 @@ create_desktop_entry() {
     local app_path=$2
     local icon_path=$3
     local desktop_file="$HOME/.local/share/applications/Affinity$app_name.desktop"
+    # Normalize paths to avoid double slashes
+    local directory="${HOME}/.AffinityLinux"
+    directory="${directory%/}"
+    app_path="${app_path//\\/\/}"  # Normalize Windows paths
     
     echo "[Desktop Entry]" > "$desktop_file"
     echo "Name=Affinity $app_name" >> "$desktop_file"
     echo "Comment=A powerful $app_name software." >> "$desktop_file"
     echo "Icon=$icon_path" >> "$desktop_file"
-    echo "Path=$HOME/.AffinityLinux" >> "$desktop_file"
-    echo "Exec=env WINEPREFIX=$HOME/.AffinityLinux $HOME/.AffinityLinux/ElementalWarriorWine/bin/wine \"$app_path\"" >> "$desktop_file"
+    echo "Path=$directory" >> "$desktop_file"
+    echo "Exec=env WINEPREFIX=$directory $directory/ElementalWarriorWine/bin/wine \"$app_path\"" >> "$desktop_file"
     echo "Terminal=false" >> "$desktop_file"
     echo "NoDisplay=false" >> "$desktop_file"
     echo "StartupWMClass=${app_name,,}.exe" >> "$desktop_file"
@@ -676,6 +680,8 @@ create_all_in_one_desktop_entry() {
     local icon_path=$1
     local desktop_file="$HOME/.local/share/applications/Affinity.desktop"
     local directory="$HOME/.AffinityLinux"
+    # Normalize directory path (remove trailing slash if present)
+    directory="${directory%/}"
     
     echo "[Desktop Entry]" > "$desktop_file"
     echo "Name=Affinity" >> "$desktop_file"
diff --git a/AffinityScripts/AffinityPhoto.sh b/AffinityScripts/AffinityPhoto.sh
@@ -565,6 +565,9 @@ print_step "Creating custom desktop entry..."
 desktop_file="$HOME/.local/share/applications/AffinityPhoto.desktop"
 mkdir -p "$HOME/.local/share/applications"
 
+# Normalize directory path (remove trailing slash if present)
+directory="${directory%/}"
+
 {
     echo "[Desktop Entry]"
     echo "Name=Affinity Photo"
diff --git a/AffinityScripts/AffinityPublisher.sh b/AffinityScripts/AffinityPublisher.sh
@@ -566,6 +566,9 @@ print_step "Creating custom desktop entry..."
 desktop_file="$HOME/.local/share/applications/AffinityPublisher.desktop"
 mkdir -p "$HOME/.local/share/applications"
 
+# Normalize directory path (remove trailing slash if present)
+directory="${directory%/}"
+
 {
     echo "[Desktop Entry]"
     echo "Name=Affinity Publisher"
diff --git a/AffinityScripts/Affinityv3.sh b/AffinityScripts/Affinityv3.sh
@@ -570,6 +570,9 @@ print_step "Creating custom desktop entry..."
 desktop_file="$HOME/.local/share/applications/Affinity.desktop"
 mkdir -p "$HOME/.local/share/applications"
 
+# Normalize directory path (remove trailing slash if present)
+directory="${directory%/}"
+
 {
     echo "[Desktop Entry]"
     echo "Name=Affinity Affinity"

Original file line number	Diff line number	Diff line change
`@@ -566,6 +566,9 @@ print_step "Creating custom desktop entry..."`
`566`	`566`	`desktop_file="$HOME/.local/share/applications/AffinityDesigner.desktop"`
`567`	`567`	`mkdir -p "$HOME/.local/share/applications"`
`568`	`568`
	`569`	`+# Normalize directory path (remove trailing slash if present)`
	`570`	`+directory="${directory%/}"`
	`571`	`+`
`569`	`572`	`{`
`570`	`573`	`echo "[Desktop Entry]"`
`571`	`574`	`echo "Name=Affinity Designer"`
Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,9 @@ print_step "Creating custom desktop entry..."`
`565`	`565`	`desktop_file="$HOME/.local/share/applications/AffinityPhoto.desktop"`
`566`	`566`	`mkdir -p "$HOME/.local/share/applications"`
`567`	`567`
	`568`	`+# Normalize directory path (remove trailing slash if present)`
	`569`	`+directory="${directory%/}"`
	`570`	`+`
`568`	`571`	`{`
`569`	`572`	`echo "[Desktop Entry]"`
`570`	`573`	`echo "Name=Affinity Photo"`
Original file line number	Diff line number	Diff line change
`@@ -570,6 +570,9 @@ print_step "Creating custom desktop entry..."`
`570`	`570`	`desktop_file="$HOME/.local/share/applications/Affinity.desktop"`
`571`	`571`	`mkdir -p "$HOME/.local/share/applications"`
`572`	`572`
	`573`	`+# Normalize directory path (remove trailing slash if present)`
	`574`	`+directory="${directory%/}"`
	`575`	`+`
`573`	`576`	`{`
`574`	`577`	`echo "[Desktop Entry]"`
`575`	`578`	`echo "Name=Affinity Affinity"`