Fix issue #1802: Unsuccessful installation, Portable Win32 version

diff --git a/Installer/InnoSetup/WinMergeARM64.is6.iss b/Installer/InnoSetup/WinMergeARM64.is6.iss
index 61c1579..f7fd7f9 100644 (file)
--- a/Installer/InnoSetup/WinMergeARM64.is6.iss
+++ b/Installer/InnoSetup/WinMergeARM64.is6.iss
@@ -366,8 +366,8 @@ Name: {app}\Languages\MergeTurkish.lang; Type: files
 Name: {app}\MergePlugins\list.txt; Type: files; Check: not IsComponentSelected('Plugins')
 
 ;Removes the user's guide icon if the user deselects the user's guide component.
-Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs')
-Name: {group}\{cm:ReadMe}.lnk; Type: files
+Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs') and not WizardNoIcons
+Name: {group}\{cm:ReadMe}.lnk; Type: files; Check: not WizardNoIcons
 
 ;This removes the quick launch icon in case the user chooses not to install it after previously having it installed
 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon')
@@ -377,12 +377,12 @@ Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Typ
 Name: {autodesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
 
 ;Removes the Uninstall icon from the start menu...
-Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files;
-Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files;
+Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files; Check: not WizardNoIcons
+Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files; Check: not WizardNoIcons
 
 ;Remove ANSI executable link from start menu for NT-based Windows versions
 ;This was installed earlier, but not anymore.
-Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4
+Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4; Check: not WizardNoIcons
 
 Name: {app}\Docs; Type: filesandordirs
 
@@ -644,8 +644,8 @@ Name: "{app}\MergePlugins"
 
 [Icons]
 ;Start Menu Icons
-Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"
-Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm
+Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"; Check: not WizardNoIcons
+Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Check: not WizardNoIcons
 
 ;Desktop Icon
 Name: {autodesktop}\WinMerge; Filename: {app}\WinMergeU.exe; Tasks: desktopicon
@@ -792,7 +792,7 @@ Name: {app}\Codecs; Type: filesandordirs
 Name: {app}\Formats; Type: filesandordirs
 Name: {app}\Lang; Type: filesandordirs
 
-Name: {group}; Type: dirifempty
+Name: {group}; Type: dirifempty; Check: not WizardNoIcons
 Name: {app}; Type: dirifempty
 
 
@@ -808,7 +808,7 @@ Var
     strGroup_Path: string;
 Begin
     {Saves the path that Inno Setup intended to create the start menu group at}
-    strGroup_Path := ExpandConstant('{group}');
+    if not WizardNoIcons Then strGroup_Path := ExpandConstant('{group}');
 
     {If the start menu path isn't blank then..}
     if strGroup_Path <> '' Then
@@ -866,7 +866,7 @@ Begin
     strOld := OldGroup();
 
     {Detects the current start menu group's path, if any (not creating a group is a valid option)}
-    strNew := ExpandConstant('{group}');
+    If not WizardNoIcons Then strNew := ExpandConstant('{group}');
 
     {removes the start menu portion of the path from the group path making it match the format of strOld}
     StringChange(strNew, ExpandConstant('{commonprograms}\'), '')

diff --git a/Installer/InnoSetup/WinMergeX64.is6.iss b/Installer/InnoSetup/WinMergeX64.is6.iss
index ccd4aa9..10c8144 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.is6.iss
+++ b/Installer/InnoSetup/WinMergeX64.is6.iss
@@ -365,8 +365,8 @@ Name: {app}\Languages\MergeTurkish.lang; Type: files
 Name: {app}\MergePlugins\list.txt; Type: files; Check: not IsComponentSelected('Plugins')\r
 \r
 ;Removes the user's guide icon if the user deselects the user's guide component.\r
-Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs')\r
-Name: {group}\{cm:ReadMe}.lnk; Type: files\r
+Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs') and not WizardNoIcons\r
+Name: {group}\{cm:ReadMe}.lnk; Type: files; Check: not WizardNoIcons\r
 \r
 ;This removes the quick launch icon in case the user chooses not to install it after previously having it installed\r
 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon')\r
@@ -376,12 +376,12 @@ Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Typ
 Name: {autodesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')\r
 \r
 ;Removes the Uninstall icon from the start menu...\r
-Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files;\r
-Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files;\r
+Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files; Check: not WizardNoIcons\r
+Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files; Check: not WizardNoIcons\r
 \r
 ;Remove ANSI executable link from start menu for NT-based Windows versions\r
 ;This was installed earlier, but not anymore.\r
-Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4\r
+Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4; Check: not WizardNoIcons\r
 \r
 Name: {app}\Docs; Type: filesandordirs\r
 \r
@@ -643,8 +643,8 @@ Name: "{app}\MergePlugins"
 \r
 [Icons]\r
 ;Start Menu Icons\r
-Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"\r
-Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm\r
+Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"; Check: not WizardNoIcons\r
+Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Check: not WizardNoIcons\r
 \r
 ;Desktop Icon\r
 Name: {autodesktop}\WinMerge; Filename: {app}\WinMergeU.exe; Tasks: desktopicon\r
@@ -791,7 +791,7 @@ Name: {app}\Codecs; Type: filesandordirs
 Name: {app}\Formats; Type: filesandordirs\r
 Name: {app}\Lang; Type: filesandordirs\r
 \r
-Name: {group}; Type: dirifempty\r
+Name: {group}; Type: dirifempty; Check: not WizardNoIcons\r
 Name: {app}; Type: dirifempty\r
 \r
 \r
@@ -807,7 +807,7 @@ Var
     strGroup_Path: string;\r
 Begin\r
     {Saves the path that Inno Setup intended to create the start menu group at}\r
-    strGroup_Path := ExpandConstant('{group}');\r
+    if not WizardNoIcons Then strGroup_Path := ExpandConstant('{group}');\r
 \r
     {If the start menu path isn't blank then..}\r
     if strGroup_Path <> '' Then\r
@@ -865,7 +865,7 @@ Begin
     strOld := OldGroup();\r
 \r
     {Detects the current start menu group's path, if any (not creating a group is a valid option)}\r
-    strNew := ExpandConstant('{group}');\r
+    If not WizardNoIcons Then strNew := ExpandConstant('{group}');\r
 \r
     {removes the start menu portion of the path from the group path making it match the format of strOld}\r
     StringChange(strNew, ExpandConstant('{commonprograms}\'), '')\r

diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss
index 0537266..c48d413 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@ -361,19 +361,19 @@ Name: {app}\Languages\MergeTurkish.lang; Type: files
 Name: {app}\MergePlugins\list.txt; Type: files; Check: not IsComponentSelected('Plugins')\r
 \r
 ;Removes the user's guide icon if the user deselects the user's guide component.\r
-Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs')\r
-Name: {group}\{cm:ReadMe}.lnk; Type: files\r
+Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs') and not WizardNoIcons\r
+Name: {group}\{cm:ReadMe}.lnk; Type: files; Check: not WizardNoIcons\r
 \r
 ;This removes the desktop icon in case the user chooses not to install it after previously having it installed\r
 Name: {commondesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')\r
 \r
 ;Removes the Uninstall icon from the start menu...\r
-Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files;\r
-Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files;\r
+Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files; Check: not WizardNoIcons\r
+Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files; Check: not WizardNoIcons\r
 \r
 ;Remove ANSI executable link from start menu for NT-based Windows versions\r
 ;This was installed earlier, but not anymore.\r
-Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4\r
+Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4; Check: not WizardNoIcons\r
 \r
 Name: {app}\Docs; Type: filesandordirs\r
 \r
@@ -635,8 +635,8 @@ Name: "{app}\MergePlugins"
 \r
 [Icons]\r
 ;Start Menu Icons\r
-Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"\r
-Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm\r
+Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"; Check: not WizardNoIcons\r
+Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Check: not WizardNoIcons\r
 \r
 ;Desktop Icon\r
 Name: {commondesktop}\WinMerge; Filename: {app}\WinMergeU.exe; Tasks: desktopicon\r
@@ -772,7 +772,7 @@ Name: {app}\Codecs; Type: filesandordirs
 Name: {app}\Formats; Type: filesandordirs\r
 Name: {app}\Lang; Type: filesandordirs\r
 \r
-Name: {group}; Type: dirifempty\r
+Name: {group}; Type: dirifempty; Check: not WizardNoIcons\r
 Name: {app}; Type: dirifempty\r
 \r
 \r
@@ -788,7 +788,7 @@ Var
     strGroup_Path: string;\r
 Begin\r
     {Saves the path that Inno Setup intended to create the start menu group at}\r
-    strGroup_Path := ExpandConstant('{group}');\r
+    if not WizardNoIcons Then strGroup_Path := ExpandConstant('{group}');\r
 \r
     {If the start menu path isn't blank then..}\r
     if strGroup_Path <> '' Then\r
@@ -846,7 +846,7 @@ Begin
     strOld := OldGroup();\r
 \r
     {Detects the current start menu group's path, if any (not creating a group is a valid option)}\r
-    strNew := ExpandConstant('{group}');\r
+    If not WizardNoIcons Then strNew := ExpandConstant('{group}');\r
 \r
     {removes the start menu portion of the path from the group path making it match the format of strOld}\r
     StringChange(strNew, ExpandConstant('{commonprograms}\'), '')\r

diff --git a/Installer/InnoSetup/WinMergeX64NonAdmin.iss b/Installer/InnoSetup/WinMergeX64NonAdmin.iss
index ed12d35..f33a470 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64NonAdmin.iss
+++ b/Installer/InnoSetup/WinMergeX64NonAdmin.iss
@@ -360,19 +360,19 @@ Name: {app}\Languages\MergeTurkish.lang; Type: files
 Name: {app}\MergePlugins\list.txt; Type: files; Check: not IsComponentSelected('Plugins')
 
 ;Removes the user's guide icon if the user deselects the user's guide component.
-Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs')
-Name: {group}\{cm:ReadMe}.lnk; Type: files
+Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs') and not WizardNoIcons
+Name: {group}\{cm:ReadMe}.lnk; Type: files; Check: not WizardNoIcons
 
 ;This removes the desktop icon in case the user chooses not to install it after previously having it installed
 Name: {userdesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
 
 ;Removes the Uninstall icon from the start menu...
-Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files;
-Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files;
+Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files; Check: not WizardNoIcons
+Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files; Check: not WizardNoIcons
 
 ;Remove ANSI executable link from start menu for NT-based Windows versions
 ;This was installed earlier, but not anymore.
-Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4
+Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4; Check: not WizardNoIcons
 
 Name: {app}\Docs; Type: filesandordirs
 
@@ -634,8 +634,8 @@ Name: "{app}\MergePlugins"
 
 [Icons]
 ;Start Menu Icons
-Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"
-Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm
+Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"; Check: not WizardNoIcons
+Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Check: not WizardNoIcons
 
 ;Desktop Icon
 Name: {userdesktop}\WinMerge; Filename: {app}\WinMergeU.exe; Tasks: desktopicon
@@ -770,7 +770,7 @@ Name: {app}\Codecs; Type: filesandordirs
 Name: {app}\Formats; Type: filesandordirs
 Name: {app}\Lang; Type: filesandordirs
 
-Name: {group}; Type: dirifempty
+Name: {group}; Type: dirifempty; Check: not WizardNoIcons
 Name: {app}; Type: dirifempty
 
 
@@ -786,7 +786,7 @@ Var
     strGroup_Path: string;
 Begin
     {Saves the path that Inno Setup intended to create the start menu group at}
-    strGroup_Path := ExpandConstant('{group}');
+    if not WizardNoIcons Then strGroup_Path := ExpandConstant('{group}');
 
     {If the start menu path isn't blank then..}
     if strGroup_Path <> '' Then
@@ -844,7 +844,7 @@ Begin
     strOld := OldGroup();
 
     {Detects the current start menu group's path, if any (not creating a group is a valid option)}
-    strNew := ExpandConstant('{group}');
+    If not WizardNoIcons Then strNew := ExpandConstant('{group}');
 
     {removes the start menu portion of the path from the group path making it match the format of strOld}
     StringChange(strNew, ExpandConstant('{commonprograms}\'), '')

diff --git a/Installer/InnoSetup/WinMergeX86.iss b/Installer/InnoSetup/WinMergeX86.iss
index 0f6d616..3287da2 100755 (executable)
--- a/Installer/InnoSetup/WinMergeX86.iss
+++ b/Installer/InnoSetup/WinMergeX86.iss
@@ -382,19 +382,19 @@ Name: {app}\Languages\MergeTurkish.lang; Type: files
 Name: {app}\MergePlugins\list.txt; Type: files; Check: not IsComponentSelected('Plugins')\r
 \r
 ;Removes the user's guide icon if the user deselects the user's guide component.\r
-Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs')\r
-Name: {group}\{cm:ReadMe}.lnk; Type: files\r
+Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs') and not WizardNoIcons\r
+Name: {group}\{cm:ReadMe}.lnk; Type: files; Check: not WizardNoIcons\r
 \r
 ;This removes the desktop icon in case the user chooses not to install it after previously having it installed\r
 Name: {commondesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')\r
 \r
 ;Removes the Uninstall icon from the start menu...\r
-Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files;\r
-Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files;\r
+Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files; Check: not WizardNoIcons\r
+Name: {group}\{cm:UninstallProgram,WinMerge}; Type: files; Check: not WizardNoIcons\r
 \r
 ;Remove ANSI executable link from start menu for NT-based Windows versions\r
 ;This was installed earlier, but not anymore.\r
-Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4\r
+Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4; Check: not WizardNoIcons\r
 \r
 Name: {app}\Docs; Type: filesandordirs\r
 \r
@@ -657,8 +657,8 @@ Name: "{app}\MergePlugins"
 \r
 [Icons]\r
 ;Start Menu Icons\r
-Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"\r
-Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm\r
+Name: {group}\WinMerge; Filename: {app}\WinMergeU.exe; AppUserModelID: "Thingamahoochie.WinMerge"; Check: not WizardNoIcons\r
+Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Check: not WizardNoIcons\r
 \r
 ;Desktop Icon\r
 Name: {commondesktop}\WinMerge; Filename: {app}\WinMergeU.exe; Tasks: desktopicon\r
@@ -792,7 +792,7 @@ Name: {app}\Codecs; Type: filesandordirs
 Name: {app}\Formats; Type: filesandordirs\r
 Name: {app}\Lang; Type: filesandordirs\r
 \r
-Name: {group}; Type: dirifempty\r
+Name: {group}; Type: dirifempty; Check: not WizardNoIcons\r
 Name: {app}; Type: dirifempty\r
 \r
 \r
@@ -808,7 +808,7 @@ Var
     strGroup_Path: string;\r
 Begin\r
     {Saves the path that Inno Setup intended to create the start menu group at}\r
-    strGroup_Path := ExpandConstant('{group}');\r
+    if not WizardNoIcons Then strGroup_Path := ExpandConstant('{group}');\r
 \r
     {If the start menu path isn't blank then..}\r
     if strGroup_Path <> '' Then\r
@@ -866,7 +866,7 @@ Begin
     strOld := OldGroup();\r
 \r
     {Detects the current start menu group's path, if any (not creating a group is a valid option)}\r
-    strNew := ExpandConstant('{group}');\r
+    If not WizardNoIcons Then strNew := ExpandConstant('{group}');\r
 \r
     {removes the start menu portion of the path from the group path making it match the format of strOld}\r
     StringChange(strNew, ExpandConstant('{commonprograms}\'), '')\r