mirror of
https://github.com/moparisthebest/hexchat
synced 2024-12-25 00:58:52 -05:00
win32: Silent installer improvements
- Launch uninstaller as VERYSILENT - Don't launch Python/Perl installers when silent
This commit is contained in:
parent
3e3939b3f0
commit
7d08750955
@ -272,15 +272,18 @@ begin
|
|||||||
|
|
||||||
if IsComponentSelected('spell') and not CheckSpellInstall() then
|
if IsComponentSelected('spell') and not CheckSpellInstall() then
|
||||||
idpAddFile(SPELL, ExpandConstant('{tmp}\spelling-dicts.exe'));
|
idpAddFile(SPELL, ExpandConstant('{tmp}\spelling-dicts.exe'));
|
||||||
|
|
||||||
if IsComponentSelected('langs\perl') and not CheckDLL('perl520.dll') then
|
if not WizardSilent() then
|
||||||
idpAddFile(PERL, ExpandConstant('{tmp}\perl.msi'));
|
begin
|
||||||
|
if IsComponentSelected('langs\perl') and not CheckDLL('perl520.dll') then
|
||||||
if IsComponentSelected('langs\python\python2') and not CheckDLL('python27.dll') then
|
idpAddFile(PERL, ExpandConstant('{tmp}\perl.msi'));
|
||||||
idpAddFile(PY2, ExpandConstant('{tmp}\python.msi'));
|
|
||||||
|
if IsComponentSelected('langs\python\python2') and not CheckDLL('python27.dll') then
|
||||||
if IsComponentSelected('langs\python\python3') and not CheckDLL('python34.dll') then
|
idpAddFile(PY2, ExpandConstant('{tmp}\python.msi'));
|
||||||
idpAddFile(PY3, 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;
|
end;
|
||||||
end;
|
end;
|
||||||
@ -356,7 +359,7 @@ begin
|
|||||||
sUnInstallString := GetUninstallString();
|
sUnInstallString := GetUninstallString();
|
||||||
if sUnInstallString <> '' then begin
|
if sUnInstallString <> '' then begin
|
||||||
sUnInstallString := RemoveQuotes(sUnInstallString);
|
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
|
Result := 3
|
||||||
else
|
else
|
||||||
Result := 2;
|
Result := 2;
|
||||||
|
Loading…
Reference in New Issue
Block a user