Skip to content

Commit cf20f44

Browse files
sschuberthsschuberth
committed
Merge pull request msysgit#33 from csware/installer
Installer
2 parents d82f37a + 2830b1f commit cf20f44

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

‎share/WinGit/install.iss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ AppPublisherURL={#APP_URL}
2626
AppVersion={#APP_VERSION}
2727
ChangesEnvironment=yes
2828
DefaultDirName={pf}\{#APP_NAME}
29+
DisableDirPage=auto
2930
DefaultGroupName={#APP_NAME}
31+
DisableProgramGroupPage=auto
3032
DisableReadyPage=yes
3133
InfoBeforeFile=gpl-2.0.rtf
3234
PrivilegesRequired=none
@@ -505,7 +507,7 @@ begin
505507
Parent:=PuTTYPage.Surface;
506508
Caption:=
507509
'PuTTY sessions were found in your Registry. You may specify the path' + #13 +
508-
'to an existing copy of (Tortoise)Plink.exe from the TortoiseSVN/CVS' + #13 +
510+
'to an existing copy of (Tortoise)Plink.exe from the TortoiseGit/SVN/CVS' + #13 +
509511
'or PuTTY applications. The GIT_SSH and SVN_SSH environment' + #13 +
510512
'variables will be adjusted to point to the following executable:';
511513
Left:=ScaleX(28);

‎share/WinGit/putty.inc.iss‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
const
2+
TortoiseGitInstallKey='SOFTWARE\TortoiseGit';
23
TortoiseSVNInstallKey='SOFTWARE\TortoiseSVN';
34
TortoiseCVSUninstallKey='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TortoiseCVS_is1';
45
PuTTYUninstallKey='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PuTTY_is1';
56
PuTTYPrivateKeyAssoc='PuTTYPrivateKey\shell\open\command';
67

78
// Tries to detect the path to a PuTTY installation / an application that comes
8-
// with an improved version of Plink. TortoisePlink from TortoiseSVN features a
9+
// with an improved version of Plink. TortoisePlink from TortoiseGit/SVN features a
910
// GUI dialog to accept new host keys, for example.
1011
function GetPuTTYLocation:string;
1112
begin
1213
// Prefer TortoisePlink over vanilla Plink for its GUI dialog to accept host keys.
13-
if (IsWin64 and RegQueryStringValue(HKEY_LOCAL_MACHINE_64,TortoiseSVNInstallKey,'Directory',Result)) or
14-
RegQueryStringValue(HKEY_LOCAL_MACHINE_32,TortoiseSVNInstallKey,'Directory',Result) then begin
15-
// C:\Program Files\TortoiseSVN\
14+
if (IsWin64 and RegQueryStringValue(HKEY_LOCAL_MACHINE_64,TortoiseGitInstallKey,'Directory',Result)) or
15+
RegQueryStringValue(HKEY_LOCAL_MACHINE_32,TortoiseGitInstallKey,'Directory',Result) then begin
16+
// C:\Program Files\TortoiseGit\
1617
Result:=Result+'bin\';
17-
// C:\Program Files\TortoiseSVN\bin\
18+
// C:\Program Files\TortoiseGit\bin\
19+
end else if (IsWin64 and RegQueryStringValue(HKEY_LOCAL_MACHINE_64,TortoiseSVNInstallKey,'Directory',Result)) or
20+
RegQueryStringValue(HKEY_LOCAL_MACHINE_32,TortoiseSVNInstallKey,'Directory',Result) then begin
21+
// C:\Program Files\TortoiseSVN\
22+
Result:=Result+'bin\';
23+
// C:\Program Files\TortoiseSVN\bin\
1824
end else begin
1925
if not (IsWin64 and RegQueryStringValue(HKEY_LOCAL_MACHINE_64,TortoiseCVSUninstallKey,'InstallLocation',Result)) then begin
2026
RegQueryStringValue(HKEY_LOCAL_MACHINE_32,TortoiseCVSUninstallKey,'InstallLocation',Result);

0 commit comments

Comments
 (0)