From 1c1557aa93cd139688ebfe5a9922a60ef2b2d8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= <tony.sarajarvi@qt.io>
Date: Sat, 6 Jan 2018 20:24:01 +0200
Subject: Provisioning: Set CMake to PATH on Ubuntu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ubuntu uses .profile file instead of .bashrc. We need to use
the correct file accordingly.

Task-number: QTBUG-65594
(cherry picked from commit 22e4664eb08dc5384c5afd0bd6c6a0725b242517)
Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 coin/provisioning/common/cmake_linux.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'coin/provisioning/common')

diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh
index 35313d3c..3efe35a0 100755
--- a/coin/provisioning/common/cmake_linux.sh
+++ b/coin/provisioning/common/cmake_linux.sh
@@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 
 echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
+if uname -a |grep -q "Ubuntu"; then
+    echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile
+else
+    echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
+fi
-- 
cgit v1.2.3


From b86b3a757b473e86aae7f246d2f1a8e0ae8e54b7 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Wed, 17 Jan 2018 17:56:20 +0100
Subject: Fix provisioning: NotePad++ path on 64 bit windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 coin/provisioning/common/windows/install-notepad++.ps1 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'coin/provisioning/common')

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."
-- 
cgit v1.2.3


From 99595f44f1b3a3c35d8decc671a8933f65220cf3 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Wed, 17 Jan 2018 15:57:27 +0100
Subject: Provisioning: Fix disabling windows updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On some machines the updates were already disabled, which lead
to the call to disable the service failing. Now we just move on without
error.

Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 .../common/windows/disable-windows-updates.ps1      | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'coin/provisioning/common')

diff --git a/coin/provisioning/common/windows/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1
index 1a014733..05215e20 100644
--- a/coin/provisioning/common/windows/disable-windows-updates.ps1
+++ b/coin/provisioning/common/windows/disable-windows-updates.ps1
@@ -33,5 +33,22 @@
 
 # This script disables the automatic Windows updates
 
-stop-service wuauserv
-set-service wuauserv –startup disabled
+$service = get-service wuauserv
+if (-not $service) {
+    Write-Host "Windows Update service not found."
+    exit 0
+}
+
+if ($service.Status -eq "Stopped") {
+    Write-Host "Windows Update service already stopped."
+} else {
+    Write-Host "Stopping Windows Update service."
+    stop-service wuauserv
+}
+
+$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
+if ($startup -ne "Disabled") {
+    set-service wuauserv -startup disabled
+} else {
+    Write-Host "Windows Update service startup already disabled."
+}
-- 
cgit v1.2.3