1 files changed, 10 insertions, 13 deletions
diff --git a/coin/provisioning/common/windows/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1
index 63088861..a22e439a 100644
--- a/coin/provisioning/common/windows/mysql.ps1
+++ b/coin/provisioning/common/windows/mysql.ps1
@@ -48,16 +48,16 @@ function DownloadAndInstall
         [string]$installPath
     )
 
-    echo "Fetching from URL ..."
+    Write-Host "Fetching from URL ..."
     Copy-Item $internalUrl $package
 
     $zipDir = [io.path]::GetFileNameWithoutExtension($package)
     Extract-Dev-Folders-From-Zip $package $zipDir $installPath
 
-    Remove-Item $package
+    Remove-Item -Path $package
 }
 
-if( (is64bitWinHost) -eq 1 ) {
+if (Is64BitWinHost) {
     # Install x64 bit version
     $architecture = "x64"
     $installFolder = "C:\Utils\my_sql\my_sql"
@@ -65,26 +65,23 @@ if( (is64bitWinHost) -eq 1 ) {
 
     DownloadAndInstall $internalUrl $packagex64 $installFolder
 
-    echo "Set environment variables ..."
-    [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
-    [Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
+    Set-EnvironmentVariable "MYSQL_INCLUDE_x64" "$installFolder\include"
+    Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\lib"
 }
 
 # Install x86 bit version
 $architecture = "x86"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
-if( (is64bitWinHost) -eq 1 ) {
+if (Is64BitWinHost) {
     $installFolder = "C:\Utils\my_sql\my_sql$architecture"
-}
-else {
+} else {
     $installFolder = "C:\Utils\my_sql\my_sql"
 }
 
 DownloadAndInstall $internalUrl $packagex86 $installFolder
 
-echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine")
+Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "$installFolder\include"
+Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\lib"
 
 # Store version information to ~/versions.txt, which is used to print version information to provision log.
-echo "MySQL = $version" >> ~/versions.txt
+Write-Output "MySQL = $version" >> ~/versions.txt