erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-11 11:25:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix(windows): bootstrap should skip install of failed downloads

Browse source
This commit is contained in:
Marc Durdin 2020-09-24 07:34:20 +10:00
parent 43415e1a4f
commit 048b4d5de1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
windows/src/desktop/setup/RunTools.pas
View file

@ -597,13 +597,16 @@ var
packLocation := pack.GetBestLocation;
if Assigned(packLocation) then
begin
LogInfo('Downloading '+packLocation.Url);
if packLocation.LocationType = iilOnline then
begin
LogInfo('Downloading '+packLocation.Url);
if not TResourceDownloader.Execute(FInstallInfo, packLocation, FSilent) then
begin
LogInfo('Failed to download '+packLocation.Url); // TODO: can we get more detail?
pack.ShouldInstall := False;
Continue; //
end;
end;
// Need to check kmshell version >= 14.0 for support for non-default
// language registration into local machine context; will not install
@ -632,7 +635,8 @@ var
s := '-s -install-tips-for-packages ';
for pack in FInstallInfo.Packages do
begin
s := s + '"'+pack.ID+'='+pack.BCP47+'" ';
if pack.ShouldInstall then
s := s + '"'+pack.ID+'='+pack.BCP47+'" ';
end;
TUtilExecute.CreateProcessAsShellUser(FKMShellPath, '"'+FKMShellPath+'" '+s, True, FExitCode);