Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Goetz <markus@woboq.com>2016-03-16 16:54:12 +0300
committerMarkus Goetz <markus@woboq.com>2016-03-18 18:00:29 +0300
commit6c517638d06ea6ae507026d8ce3d0645f3eccd8f (patch)
tree54a275631cb304030e773b26527527845d426aff /cmake/modules/NSIS.template.in
parent6c07f08175f031ce70cc0b7512343b03e6f898b6 (diff)
NSIS Silent mode: Force uninstall before install #4543
Diffstat (limited to 'cmake/modules/NSIS.template.in')
-rw-r--r--cmake/modules/NSIS.template.in11
1 files changed, 11 insertions, 0 deletions
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 98d5a3df6..ffed3798c 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