From: David Matson Date: Fri, 23 Nov 2012 18:43:49 +0000 (-0800) Subject: Installer: Use sh.exe directly in Git Bash icon if possible (fixes #71). X-Git-Url: https://repo.or.cz/w/msysgit.git/commitdiff_plain/d5f2b0e00eea7c96788d974f696b6d3bfe9efbd3 Installer: Use sh.exe directly in Git Bash icon if possible (fixes #71). To avoid side-effects on other cmd.exe windows, point the Git Bash icon directly to sh.exe on Windows Vista and newer. On 64-bit Windows XP, launching through 32-bit cmd.exe is required to get sh.exe to launch as a 32-bit process, but on Windows Vista and newer, this workaround is no longer required (see commit b6ea386007f0c194bf1e21c057386f639eed831c). On Windows 8, if a start menu link points to cmd.exe but uses a different icon, that icon is also used by some other cmd.exe windows, even if the link has command line parameters. On Windows 7, the side-effect is different; if the Git Bash link uses cmd.exe, Windows groups Git Bash together with other cmd.exe windows. By avoiding launching through cmd.exe when it is not necessary, we avoid affecting the icon used by other cmd.exe windows. Signed-off-by: David Matson --- diff --git a/share/WinGit/install.iss b/share/WinGit/install.iss index fe2d5ceb..5205a7b1 100644 --- a/share/WinGit/install.iss +++ b/share/WinGit/install.iss @@ -83,7 +83,8 @@ Source: ReleaseNotes.rtf; DestDir: {app}; Flags: isreadme replacesameversion; Af [Icons] Name: {group}\Git GUI; Filename: {app}\bin\wish.exe; Parameters: """{app}\libexec\git-core\git-gui"""; WorkingDir: %HOMEDRIVE%%HOMEPATH%; IconFilename: {app}\etc\git.ico -Name: {group}\Git Bash; Filename: {syswow64}\cmd.exe; Parameters: "/c """"{app}\bin\sh.exe"" --login -i"""; WorkingDir: %HOMEDRIVE%%HOMEPATH%; IconFilename: {app}\etc\git.ico +Name: {group}\Git Bash; Filename: {syswow64}\cmd.exe; Parameters: "/c """"{app}\bin\sh.exe"" --login -i"""; WorkingDir: %HOMEDRIVE%%HOMEPATH%; IconFilename: {app}\etc\git.ico; OnlyBelowVersion: 6.0 +Name: {group}\Git Bash; Filename: {app}\bin\sh.exe; Parameters: "--login -i"; WorkingDir: %HOMEDRIVE%%HOMEPATH%; IconFilename: {app}\etc\git.ico; MinVersion: 6.0 [Messages] BeveledLabel={#APP_URL}