erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-11 16:37:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #4398 from keymanapp/fix/developer/4354-setup-redist-check

Browse source 
fix(developer): don't check both setup.exe and setup-redist.exe
This commit is contained in:
Marc Durdin 2021-02-03 07:07:37 +11:00 • committed by GitHub
commit aebdec42bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
windows/src/global/delphi/general/CompilePackageInstaller.pas
View file

@ -294,10 +294,10 @@ begin
WriteMessage('Redist path not specified, loading default ('+FRedistSetupPath+')');
end;
if not FileExists(FRedistSetupPath + 'setup.exe') or
if not FileExists(FRedistSetupPath + 'setup.exe') and
not FileExists(FRedistSetupPath + 'setup-redist.exe') then
begin
FatalMessage('setup.exe or setup-redist.exe are missing from redist ('+FRedistSetupPath+').');
FatalMessage('Neither setup.exe nor setup-redist.exe are present in redist ('+FRedistSetupPath+').');
Exit;
end;