Fix provisioning: NotePad++ path on 64 bit windows
authorFrederik Gladhorn <frederik.gladhorn@qt.io>
Wed, 17 Jan 2018 16:56:20 +0000 (17:56 +0100)
committerSimo Fält <simo.falt@qt.io>
Fri, 2 Feb 2018 06:04:21 +0000 (06:04 +0000)
We install the 64 bit version of np++ which is installed in the regular
program files folder.

Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit b86b3a757b473e86aae7f246d2f1a8e0ae8e54b7)

coin/provisioning/common/windows/install-notepad++.ps1

index a6e20d5..4fad6f6 100644 (file)
@@ -57,11 +57,6 @@ Remove-Item -Recurse -Force "$nppPackage"
 
 echo "Notepad++ = $version" >> ~\versions.txt
 
-if( (is64bitWinHost) -eq 1 ) {
-    Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
-}
-else {
-    Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
-}
+Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
 
 echo "Auto-updating disabled."