From 7d087509555c955d55418358fbcd28312eeb2f13 Mon Sep 17 00:00:00 2001 From: TingPing Date: Fri, 27 Jun 2014 19:10:55 -0400 Subject: [PATCH] win32: Silent installer improvements - Launch uninstaller as VERYSILENT - Don't launch Python/Perl installers when silent --- win32/installer/hexchat.iss.tt | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 022b0be0..b1984bfa 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -272,15 +272,18 @@ begin if IsComponentSelected('spell') and not CheckSpellInstall() then idpAddFile(SPELL, ExpandConstant('{tmp}\spelling-dicts.exe')); - - if IsComponentSelected('langs\perl') and not CheckDLL('perl520.dll') then - idpAddFile(PERL, ExpandConstant('{tmp}\perl.msi')); - - if IsComponentSelected('langs\python\python2') and not CheckDLL('python27.dll') then - idpAddFile(PY2, ExpandConstant('{tmp}\python.msi')); - - if IsComponentSelected('langs\python\python3') and not CheckDLL('python34.dll') then - idpAddFile(PY3, ExpandConstant('{tmp}\python.msi')); + + if not WizardSilent() then + begin + if IsComponentSelected('langs\perl') and not CheckDLL('perl520.dll') then + idpAddFile(PERL, ExpandConstant('{tmp}\perl.msi')); + + if IsComponentSelected('langs\python\python2') and not CheckDLL('python27.dll') then + idpAddFile(PY2, ExpandConstant('{tmp}\python.msi')); + + if IsComponentSelected('langs\python\python3') and not CheckDLL('python34.dll') then + idpAddFile(PY3, ExpandConstant('{tmp}\python.msi')); + end; end; end; end; @@ -356,7 +359,7 @@ begin sUnInstallString := GetUninstallString(); if sUnInstallString <> '' then begin sUnInstallString := RemoveQuotes(sUnInstallString); - if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then + if Exec(sUnInstallString, '/VERYSILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then Result := 3 else Result := 2;