fix icons not being installed where they should, causing permission i…

…ssues (fix #1623)
marticliment · Dec 12, 2023 · c5f6331 · c5f6331
1 parent 3346bfd
commit c5f6331
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/CustomMessages.iss b/CustomMessages.iss
@@ -30,7 +30,7 @@ Catalan.ShCuts=Dreceres
 Catalan.PortInst=Feu una instal·lació portàtil
 Catalan.RegInst=Feu una instal·lació regular
 Catalan.RegStartMmenuIcon=Creeu una drecera al menú Inici
-Catalan.RegDesktopIcon=Creeu una drecera a l'escriptori
+Catalan.RegDesktopIcon=Creeu una drecera a l'Escriptori
 
 ; Corsican
 Corsican.InstallType=Tipu d'installazione

diff --git a/WingetUI.iss b/WingetUI.iss
@@ -78,33 +78,33 @@ Name: "Ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
 #include "CustomMessages.iss"
 
 [InstallDelete]
-//[InstallDelete]
-//Type: files; Name: "{userdesktop}\WingetUI.lnk"
-//Type: files; Name: "{userstartmenu}\WingetUI.lnk"
+;[InstallDelete]
+;Type: files; Name: "{userdesktop}\WingetUI.lnk"
+;Type: files; Name: "{userstartmenu}\WingetUI.lnk"
 
-//Type: filesandordirs; Name: "{userpf}\WingetUI\*.pyc"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
-//Type: filesandordirs; Name: "{userpf}\WingetUI\PySide6\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
-//Type: filesandordirs; Name: "{userpf}\WingetUI\clr_loader\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\components\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\data\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\lang\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\markupsafe\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\PackageManagers\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\PySide6\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\pythonnet\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\pywin32_system32\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\shiboken6\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\winsdk\*";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\pip-23.1.2.dist-info";
-//Type: filesandordirs; Name: "{userpf}\WingetUI\setuptools-65.5.0.dist-info";   
-//Type: filesandordirs; Name: "{userpf}\WingetUI\sudo\*";
-////Type: filesandordirs; Name: "{userpf}\WingetUI\winget-cli\*";      
-//Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*";   
-//Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*.pyd";  
-//Type: filesandordirs; Name: "{userpf}\WingetUI\resources\api-ms-win*.dll";  
-//Type: filesandordirs; Name: "{userpf}\WingetUI\resources\python*.dll";  
-//Type: filesandordirs; Name: "{userpf}\WingetUI\resources\wingetui.exe";  
+;Type: filesandordirs; Name: "{userpf}\WingetUI\*.pyc"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
+;Type: filesandordirs; Name: "{userpf}\WingetUI\PySide6\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
+;Type: filesandordirs; Name: "{userpf}\WingetUI\clr_loader\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\components\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\data\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\lang\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\markupsafe\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\PackageManagers\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\PySide6\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\pythonnet\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\pywin32_system32\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\shiboken6\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\winsdk\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\pip-23.1.2.dist-info";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\setuptools-65.5.0.dist-info";   
+;Type: filesandordirs; Name: "{userpf}\WingetUI\sudo\*";
+;Type: filesandordirs; Name: "{userpf}\WingetUI\winget-cli\*";      
+;Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*";   
+;Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*.pyd";  
+;Type: filesandordirs; Name: "{userpf}\WingetUI\resources\api-ms-win*.dll";  
+;Type: filesandordirs; Name: "{userpf}\WingetUI\resources\python*.dll";  
+;Type: filesandordirs; Name: "{userpf}\WingetUI\resources\wingetui.exe";  
 Type: filesandordirs; Name: "{app}\*.pyc"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
 Type: filesandordirs; Name: "{app}\PySide6\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
 Type: filesandordirs; Name: "{app}\pip-23.0.dist-info";
@@ -246,8 +246,8 @@ Source: "SegUIVar.ttf"; DestDir: "{autofonts}"; FontInstall: "Segoe UI Variable"
 
 [Icons]
 ; Yes, they do have a space. This has been done in purpose for the updater to handle properly the new shortcuts
-Name: "{commonstartmenu}\{#MyAppName} "; Filename: "{app}\{#MyAppExeName}"; Tasks: regularinstall\startmenuicon
-Name: "{commondesktop}\{#MyAppName} "; Filename: "{app}\{#MyAppExeName}"; Tasks: regularinstall\desktopicon
+Name: "{autostartmenu}\{#MyAppName} "; Filename: "{app}\{#MyAppExeName}"; Tasks: regularinstall\startmenuicon
+Name: "{autodesktop}\{#MyAppName} "; Filename: "{app}\{#MyAppExeName}"; Tasks: regularinstall\desktopicon
 
 [Run]
 Filename: "{tmp}\vcredist.exe"; Flags: runhidden; Parameters: "/install /norestart /passive"; StatusMsg: "Installing Microsoft Visual C++ Redistributables (x64)"; Check: VCRedistNeedsInstall;