From 8c2bb6fe63364548629ea75396e21ee4350fdaba Mon Sep 17 00:00:00 2001 From: Hopek Date: Mon, 9 Mar 2020 01:22:12 -0500 Subject: [PATCH] Cleans up the limited amount of powershell we use --- tools/SQLAlertEmail/email_script.ps1 | 8 ++++---- tools/appveyor/build.ps1 | 10 +++++----- tools/tgs4_scripts/PreSynchronize.ps1 | 22 +++++++++++----------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/SQLAlertEmail/email_script.ps1 b/tools/SQLAlertEmail/email_script.ps1 index 1ffa8d1b4495..3891c25cdc3d 100644 --- a/tools/SQLAlertEmail/email_script.ps1 +++ b/tools/SQLAlertEmail/email_script.ps1 @@ -12,12 +12,12 @@ $Matches = Get-ChildItem "$Path$Date" -recurse -include *.log | Select-String "$ $email = New-Object System.Net.Mail.MailMessage $email.From = $From -foreach($i in $To) {$email.To.Add($i)} +foreach ($i in $To) { $email.To.Add($i) } $email.Subject = $Subject -$MatchList = foreach($m in $Matches) {"`t$m`n"} -$email.Body = $Body+"`n"+$MatchList +$MatchList = foreach ($m in $Matches) { "`t$m`n" } +$email.Body = $Body + "`n" + $MatchList $smtp = New-Object System.Net.Mail.SmtpClient($SMTPServer, $SMTPPort); $smtp.Credentials = New-Object System.Net.NetworkCredential($Account, $Password); $smtp.EnableSSL = $true -$smtp.Send($email); \ No newline at end of file +$smtp.Send($email); diff --git a/tools/appveyor/build.ps1 b/tools/appveyor/build.ps1 index 6bda07997716..5d409f5f044d 100644 --- a/tools/appveyor/build.ps1 +++ b/tools/appveyor/build.ps1 @@ -1,10 +1,10 @@ -if(!(Test-Path -Path "C:/byond")){ - bash tools/appveyor/download_byond.sh - [System.IO.Compression.ZipFile]::ExtractToDirectory("C:/byond.zip", "C:/") - Remove-Item C:/byond.zip +if (!(Test-Path -Path "C:/byond")) { + bash tools/appveyor/download_byond.sh + [System.IO.Compression.ZipFile]::ExtractToDirectory("C:/byond.zip", "C:/") + Remove-Item C:/byond.zip } Set-Location $env:APPVEYOR_BUILD_FOLDER &"C:/byond/bin/dm.exe" -max_errors 0 tgstation.dme -exit $LASTEXITCODE \ No newline at end of file +exit $LASTEXITCODE diff --git a/tools/tgs4_scripts/PreSynchronize.ps1 b/tools/tgs4_scripts/PreSynchronize.ps1 index cf5a27d0a0c5..e65b7f82329a 100644 --- a/tools/tgs4_scripts/PreSynchronize.ps1 +++ b/tools/tgs4_scripts/PreSynchronize.ps1 @@ -1,29 +1,29 @@ param( - $game_path + $game_path ) -cd $game_path +Set-Location $game_path Write-Host "Installing pip dependencies..." pip3 install PyYaml beautifulsoup4 -if(!$?){ - Write-Host "pip3 returned non-zero!" - exit $LASTEXITCODE +if (!$?) { + Write-Host "pip3 returned non-zero!" + exit $LASTEXITCODE } Write-Host "Running changelog script..." python3 tools/ss13_genchangelog.py html/changelog.html html/changelogs -if(!$?){ - Write-Host "python3 returned non-zero!" - exit $LASTEXITCODE +if (!$?) { + Write-Host "python3 returned non-zero!" + exit $LASTEXITCODE } Write-Host "Committing changes..." git add html -if(!$?){ - Write-Host "`git add` returned non-zero!" - exit $LASTEXITCODE +if (!$?) { + Write-Host "`git add` returned non-zero!" + exit $LASTEXITCODE } #we now don't care about failures