summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2018-01-17 17:56:20 +0100
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-01-18 21:08:21 +0000
commitb86b3a757b473e86aae7f246d2f1a8e0ae8e54b7 (patch)
tree8fad24fc76a416cbe4f84e8bcc2ca39cc5a7504c
parentb1198d34020f2aa291943ac5ee2a7a1eb19dbaf3 (diff)
Fix provisioning: NotePad++ path on 64 bit windows
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>
-rw-r--r--coin/provisioning/common/windows/install-notepad++.ps17
1 files changed, 1 insertions, 6 deletions
diff --git a/coin/provisioning/common/windows/install-notepad++.ps1 b/coin/provisioning/common/windows/install-notepad++.ps1
index a6e20d5e..4fad6f6d 100644
--- a/coin/provisioning/common/windows/install-notepad++.ps1
+++ b/coin/provisioning/common/windows/install-notepad++.ps1
@@ -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."