cjones/restic-windows-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up variable naming, style conventions for previous PR

Browse Source
This commit is contained in:
Kevin Woley
2024-11-10 23:41:08 -08:00
parent aad279210a
commit efcdc9d291
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backup.ps1
View File

@@ -302,11 +302,11 @@ function Send-Email {
$Action = "Backup" $Action = "Backup"
} }
if ([String]::IsNullOrEmpty($ResticEmailPassword)) { # set email credentials if a username and passsword are provided in configuration
$ResticEmailCredentials = @{} $credentials = @{}
} else { if (-not [String]::IsNullOrEmpty($ResticEmailPassword) -and -not [String]::IsNullOrEmpty($ResticEmailUsername)) {
$password = ConvertTo-SecureString $ResticEmailPassword -AsPlainText -Force $password = ConvertTo-SecureString $ResticEmailPassword -AsPlainText -Force
$ResticEmailCredentials = @{Credential = New-Object System.Management.Automation.PSCredential ($ResticEmailUsername, $password)} $credentials = @{Credential = New-Object System.Management.Automation.PSCredential ($ResticEmailUsername, $password)}
} }
$status = "SUCCESS" $status = "SUCCESS"
@@ -338,7 +338,7 @@ function Send-Email {
# create a temporary error log to log errors; can't write to the same file that Send-MailMessage is reading # create a temporary error log to log errors; can't write to the same file that Send-MailMessage is reading
$temp_error_log = $ErrorLog + "_temp" $temp_error_log = $ErrorLog + "_temp"
Send-MailMessage @ResticEmailConfig -From $ResticEmailFrom -To $ResticEmailTo @ResticEmailCredentials -Subject $subject -Body $body @attachments 3>&1 2>> $temp_error_log Send-MailMessage @ResticEmailConfig -From $ResticEmailFrom -To $ResticEmailTo @credentials -Subject $subject -Body $body @attachments 3>&1 2>> $temp_error_log
if(-not $?) { if(-not $?) {
"[[Email]] Sending email completed with errors" | Tee-Object -Append $temp_error_log | Out-File -Append $SuccessLog "[[Email]] Sending email completed with errors" | Tee-Object -Append $temp_error_log | Out-File -Append $SuccessLog