lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an issue where the newly added Git LFS PATH location wasn't refreshed in time for use later in the installer script and silently failed to initialize Git LFS.

Browse Source 
If for any reason there is an issue running 'git lfs install', the installer will display a message box asking the user to manually do so.
Added a GIT_LFS_PATH global env var for later use.
This commit is contained in:
Scott Richmond 2016-04-13 23:43:35 +01:00
parent 44903ba144
commit 4c72dc438d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
script/windows-installer/inno-setup-git-lfs-installer.iss
View File

@ -45,6 +45,7 @@ Source: ..\..\git-lfs-x86.exe; DestDir: "{app}"; Flags: ignoreversion; DestName:
[Registry]
Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; Check: NeedsAddPath('{app}')
Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string; ValueName: "GIT_LFS_PATH"; ValueData: "{app}"
[Code]
// Uses cmd to parse and find the location of Git through the env vars.
@ -55,12 +56,12 @@ var
ExecStdOut: AnsiString;
ResultCode: integer;
begin
begin
TmpFileName := ExpandConstant('{tmp}') + '\git_location.txt';
Exec(
ExpandConstant('{cmd}'),
'/C "for %i in (git.exe) do @echo. %~$PATH:i > "' + TmpFileName + '"',
'/C "for %i in (git.exe) do @echo. %~$PATH:i > "' + TmpFileName + '"',
'', SW_HIDE, ewWaitUntilTerminated, ResultCode
);
@ -93,9 +94,9 @@ begin
end;
// look for the path with leading and trailing semicolon and with or without \ ending
// Pos() returns 0 if not found
Result := Pos(';' + UpperCase(ParamExpanded) + ';', ';' + UpperCase(OrigPath) + ';') = 0;
Result := Pos(';' + UpperCase(ParamExpanded) + ';', ';' + UpperCase(OrigPath) + ';') = 0;
if Result = True then
Result := Pos(';' + UpperCase(ParamExpanded) + '\;', ';' + UpperCase(OrigPath) + ';') = 0;
Result := Pos(';' + UpperCase(ParamExpanded) + '\;', ';' + UpperCase(OrigPath) + ';') = 0;
end;
// Runs the lfs initialization.
@ -105,9 +106,13 @@ var
begin
Exec(
ExpandConstant('{cmd}'),
'/C "git lfs install"',
ExpandConstant('/C ""{app}\git-lfs.exe" install"'),
'', SW_HIDE, ewWaitUntilTerminated, ResultCode
);
if not ResultCode = 1 then
MsgBox(
'Git LFS was not able to automatically initialize itself. ' +
'Please run "git lfs install" from the commandline.', mbInformation, MB_OK);
end;
// Event function automatically called when uninstalling: function InitializeUninstall(): Boolean;
@ -116,8 +121,9 @@ var
begin
Exec(
ExpandConstant('{cmd}'),
'/C "git lfs uninstall"',
ExpandConstant('/C ""{app}\git-lfs.exe" uninstall"'),
'', SW_HIDE, ewWaitUntilTerminated, ResultCode
);
Result := True;
end;