From 98111a6fc764b52ad5d3f1ccca3ff109d650e231 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Sun, 21 Feb 2010 21:26:13 +0100 Subject: [PATCH] Installer: For now, do not offer git-cheetah on 64-bit Windows Revert this commit when a 64-bit git-cheetah becomes available. Signed-off-by: Sebastian Schuberth --- share/WinGit/install.iss | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/share/WinGit/install.iss b/share/WinGit/install.iss index 331b3ce5..98a678f5 100644 --- a/share/WinGit/install.iss +++ b/share/WinGit/install.iss @@ -46,7 +46,7 @@ Name: ext; Description: Windows Explorer integration; Types: custom Name: ext\reg; Description: Context menu entries; Flags: exclusive; Types: custom Name: ext\reg\shellhere; Description: Git Bash Here; Types: custom Name: ext\reg\guihere; Description: Git GUI Here; Types: custom -Name: ext\cheetah; Description: git-cheetah shell extension; Flags: exclusive; Types: custom +Name: ext\cheetah; Description: git-cheetah shell extension (32-bit only); Flags: exclusive; Types: custom Name: assoc; Description: Associate .git* configuration files with the default text editor; Types: custom Name: consolefont; Description: Use a TrueType font in the console (required for proper character encoding); Types: custom @@ -245,7 +245,7 @@ end; procedure InitializeWizard; var - PrevPageID:Integer; + i,PrevPageID:Integer; LblGitBash,LblGitCmd,LblGitCmdTools,LblGitCmdToolsWarn:TLabel; LblOpenSSH,LblPlink:TLabel; PuTTYSessions:TArrayOfString; @@ -253,6 +253,20 @@ var BtnPlink:TButton; Data:String; begin + // Until we have a 64-bit version of git-cheetah, disable it on 64-bit Windows. + if isWin64 then begin + for i:=0 to WizardForm.ComponentsList.Items.Count-1 do begin + Data:=LowerCase(WizardForm.ComponentsList.ItemCaption[i]); + if Pos('context',Data)>0 then begin + // Select the Registry-based context menu entries. + WizardForm.ComponentsList.Checked[i]:=True; + end else if Pos('cheetah',Data)>0 then begin + // Disable the git-cheetah shell extension. + WizardForm.ComponentsList.ItemEnabled[i]:=False; + end; + end; + end; + PrevPageID:=wpSelectProgramGroup; (* -- 2.11.4.GIT