saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaning up output from write-host

Browse source 
Just getting rid of new lines in output
This commit is contained in:
Pat O'Shea 2015-07-18 09:14:57 -06:00
parent 7b706dbece
commit c7c1f61386
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap-salt.ps1
View file

@ -100,14 +100,14 @@ If ([IntPtr]::Size -eq 4) {
} }
# Download minion setup file # Download minion setup file
Write-Host "Downloading Salt minion installer Salt-Minion-$version-$arch-Setup.exe" Write-Host -NoNewline "Downloading Salt minion installer Salt-Minion-$version-$arch-Setup.exe"
$webclient = New-Object System.Net.WebClient $webclient = New-Object System.Net.WebClient
$url = "https://docs.saltstack.com/downloads/Salt-Minion-$version-$arch-Setup.exe" $url = "https://docs.saltstack.com/downloads/Salt-Minion-$version-$arch-Setup.exe"
$file = "C:\tmp\salt.exe" $file = "C:\tmp\salt.exe"
$webclient.DownloadFile($url, $file) $webclient.DownloadFile($url, $file)
# Install minion silently # Install minion silently
Write-Host "Installing Salt minion" Write-Host -NoNewline "Installing Salt minion"
#Wait for process to exit before continuing. #Wait for process to exit before continuing.
C:\tmp\salt.exe /S /minion-name=$minion /master=$master | Out-Null C:\tmp\salt.exe /S /minion-name=$minion /master=$master | Out-Null
@ -141,14 +141,14 @@ If($runservice) {
# If the salt-minion service is still not running, something probably # If the salt-minion service is still not running, something probably
# went wrong and user intervention is required - report failure. # went wrong and user intervention is required - report failure.
If ($service.Status -eq "Stopped") { If ($service.Status -eq "Stopped") {
Write-Host "Failed to start salt minion" Write-Host -NoNewline "Failed to start salt minion"
exit 1 exit 1
} }
} }
Else { Else {
Write-Host "Stopping salt minion and setting it to 'Manual'" Write-Host -NoNewline "Stopping salt minion and setting it to 'Manual'"
Set-Service "salt-minion" -startupType "Manual" Set-Service "salt-minion" -startupType "Manual"
Stop-Service "salt-minion" Stop-Service "salt-minion"
} }
Write-Host "Salt minion successfully installed" Write-Host -NoNewline "Salt minion successfully installed"