support services with spaces

jabbera · Aug 18, 2016 · 0be355e · 0be355e
1 parent 4923583
commit 0be355e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Extensions/WindowsServiceReleaseTasks/Src/Tasks/StartWindowsService/StartWindowsService.ps1 b/Extensions/WindowsServiceReleaseTasks/Src/Tasks/StartWindowsService/StartWindowsService.ps1
@@ -16,6 +16,6 @@ $env:CURRENT_TASK_ROOTDIR = Split-Path -Parent $MyInvocation.MyCommand.Path
 
 . $env:CURRENT_TASK_ROOTDIR\Utility.ps1
 
-$serviceNames = $serviceNames -replace '\s','' # no spaces allows in argument lists
+$serviceNames = '"' + $serviceNames + '"'
 
 Remote-ServiceStartStop -serviceNames $serviceNames -environmentName $environmentName -adminUserName $adminUserName -adminPassword $adminPassword -startupType $startupType -protocol $protocol -testCertificate $testCertificate -waitTimeoutInSeconds $waitTimeoutInSeconds -internStringFileName "StartWindowsServiceIntern.ps1" -killIfTimedOut "false"
diff --git a/...ns/WindowsServiceReleaseTasks/Src/Tasks/StartWindowsService/StartWindowsServiceIntern.ps1 b/...ns/WindowsServiceReleaseTasks/Src/Tasks/StartWindowsService/StartWindowsServiceIntern.ps1
@@ -5,7 +5,7 @@ param(
 	[string][Parameter(Mandatory=$true)] $killIfTimedOut
 )
 
-[string[]] $servicesNamesArray = ($serviceNames -split ',').Trim()
+[string[]] $servicesNamesArray = ($serviceNames -split ',' -replace '"').Trim()
 $presentServicesArray = Get-Service | Where-Object { $servicesNamesArray -contains $_.Name }
 
 if ($servicesNamesArray.Length -ne $presentServicesArray.Length)

diff --git a/Extensions/WindowsServiceReleaseTasks/Src/Tasks/StopWindowsService/StopWindowsService.ps1 b/Extensions/WindowsServiceReleaseTasks/Src/Tasks/StopWindowsService/StopWindowsService.ps1
@@ -17,6 +17,6 @@ $env:CURRENT_TASK_ROOTDIR = Split-Path -Parent $MyInvocation.MyCommand.Path
 
 . $env:CURRENT_TASK_ROOTDIR\Utility.ps1
 
-$serviceNames = $serviceNames -replace '\s','' # no spaces allows in argument lists
+$serviceNames = '"' + $serviceNames + '"'
 
 Remote-ServiceStartStop -serviceNames $serviceNames -environmentName $environmentName -adminUserName $adminUserName -adminPassword $adminPassword -startupType $startupType -protocol $protocol -testCertificate $testCertificate -waitTimeoutInSeconds $waitTimeoutInSeconds -internStringFileName "StopWindowsServiceIntern.ps1" -killIfTimedOut $killIfTimedOut
diff --git a/...ions/WindowsServiceReleaseTasks/Src/Tasks/StopWindowsService/StopWindowsServiceIntern.ps1 b/...ions/WindowsServiceReleaseTasks/Src/Tasks/StopWindowsService/StopWindowsServiceIntern.ps1
@@ -5,7 +5,7 @@ param(
 	[string][Parameter(Mandatory=$true)] $killIfTimedOut
 )
 
-[string[]] $servicesNamesArray = ($serviceNames -split ',').Trim()
+[string[]] $servicesNamesArray = ($serviceNames -split ',' -replace '"').Trim()
 $presentServicesArray = Get-Service | Where-Object { $servicesNamesArray -contains $_.Name }
 
 if ($servicesNamesArray.Length -ne $presentServicesArray.Length)