From 87a45f71a1d6b2db22a0ab79e18038978554561e Mon Sep 17 00:00:00 2001 From: Michael Curran Date: Sun, 18 Mar 2012 17:09:55 +1000 Subject: [PATCH] installer.update: unregisterInstallation should be called with 'forUpdate' as True. Also add an 'unregisterInstall' command to nvda_slave which runs installer.unregisterInstallation. This will eventually be called by a stand-alone uninstaller executable. --- source/installer.py | 2 +- source/nvda_slave.pyw | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/installer.py b/source/installer.py index 9d93503f0..a73f64d40 100644 --- a/source/installer.py +++ b/source/installer.py @@ -227,7 +227,7 @@ def install(installDir,startMenuFolder,shouldInstallService=True,shouldCreateDes registerInstallation(installDir,startMenuFolder,shouldInstallService,shouldCreateDesktopShortcut,shouldRunAtLogon) def update(): - install(getInstallPath(),getStartMenuFolder(),shouldInstallService=config.isServiceInstalled()) + install(getInstallPath(),getStartMenuFolder(),shouldInstallService=config.isServiceInstalled(),forUpdate=True) autorunTemplate="""[AutoRun] open={exe} diff --git a/source/nvda_slave.pyw b/source/nvda_slave.pyw index 9b06dbfb4..386a68d69 100755 --- a/source/nvda_slave.pyw +++ b/source/nvda_slave.pyw @@ -25,6 +25,9 @@ def main(): elif action=="updateInstall": import installer installer.update() + elif action=="unregisterInstall": + import installer + installer.unregisterInstallation() elif action=="launchNVDA": import subprocess import shellapi -- 2.11.0