[Pkg-owncloud-commits] [owncloud-client] 180/470: NSIS Silent mode: Force uninstall before install #4543

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 6c517638d06ea6ae507026d8ce3d0645f3eccd8f
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Mar 16 14:54:12 2016 +0100

    NSIS Silent mode: Force uninstall before install #4543
---
 cmake/modules/NSIS.template.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 98d5a3d..ffed379 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -757,6 +757,12 @@ Function .onInit
 
    ;Shutdown ${APPLICATION_NAME} in case Add/Remove re-installer option used.
    Call EnsureOwncloudShutdown
+
+   ReadRegStr $R0 ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "InstallLocation"
+   ${If} ${Silent}
+   ${AndIf} $R0 != ""
+       ExecWait '"$R0\Uninstall.exe" /S _?=$R0'
+   ${EndIf}
 FunctionEnd
 
 Function .onInstSuccess
@@ -766,6 +772,11 @@ Function .onInstSuccess
       WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "skipUpdateCheck" "1"
    ${EndIf}
 
+   ; TODO: Only needed to when updating from 2.1.{0,1}. Remove in due time.
+   Delete /REBOOTOK $INSTDIR\bearer\qgenericbearer.dll
+   Delete /REBOOTOK $INSTDIR\bearer\qnativewifibearer.dll
+   RMDir /REBOOTOK $INSTDIR\bearer
+
    ${If} ${Silent}
    ${AndIf} $InstallRunIfSilent == "yes"
      Call LaunchApplication

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git