PaperCutSoftware/GhostTrap
1
0
Fork 0
mirror of https://github.com/PaperCutSoftware/GhostTrap.git synced 2025-12-11 08:43:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

add silent logging, fixing a file name bug, initialise a global flag to monitor whether we have tried to install vc deps in function PrepareToInstall

Browse Source
This commit is contained in:
Leo Menzies-Ye 2025-02-20 11:34:44 +11:00
parent e2c0e3d2d8
commit 8384a17b8c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
installer/win/ghost-trap.iss
View File

@ -87,7 +87,7 @@ Type: filesandordirs; Name: {app}\lib\cidfmap;
[Code]
var
VC_Redist_Installed: Boolean = False;
VC_Redist_Installed: Boolean;
function FontsDirWithForwardSlashes(Param: String): String;
begin
@ -120,11 +120,15 @@ begin
sUnInstallString := RemoveQuotes(sUnInstallString);
Exec(ExpandConstant(sUnInstallString), '/VERYSILENT', '', SW_SHOW, ewWaitUntilTerminated, iResultCode);
end;
VC_Redist_Installed := False;
end;
function IsDependencyInstallationAlreadyRunning(const Filter: string): Boolean;
var
WbemObjectSet: Variant;
WbemLocator: Variant;
WbemServices: Variant;
WQLQuery: String;
begin
Result := False;
try
@ -162,12 +166,13 @@ begin
end;
if IsWin64 then
VC_Redist := ExpandConstant('{app}\vc_redist_x64.exe')
VC_Redist := ExpandConstant('{app}\vc_redist.x64.exe')
else
VC_Redist := ExpandConstant('{app}\vc_redist_x86.exe');
VC_Redist := ExpandConstant('{app}\vc_redist.x86.exe');
if not IsDependencyInstallationAlreadyRunning('VC_redist') then
begin
Log(Format('The VC++ dependency to install will be: %s', [VC_Redist]));
if Exec(VC_Redist, '/norestart /install /quiet', ExpandConstant('{app}'), SW_HIDE, ewWaitUntilTerminated, ErrorCode) then
begin
Log('VC dependencies successfully installed.');