Text and List/Mods Path error handling

pull/257/head
KnifMelti 2022-12-28 16:07:18 +01:00
parent 51dfd99b93
commit ba6ed977b8
2 changed files with 13 additions and 9 deletions

View File

@ -23,8 +23,12 @@
<string id="ModsPath">Get Mods from external Path (URL/UNC/Local)</string> <string id="ModsPath">Get Mods from external Path (URL/UNC/Local)</string>
<string id="ModsPath_Explain">If this policy is enabled, you can set a (URL/UNC/Local) Path to external mods other than the default. If this policy is disabled or not configured, the default ModsPath is used.</string> <string id="ModsPath_Explain">If this policy is enabled, you can set a (URL/UNC/Local) Path to external mods other than the default. If this policy is disabled or not configured, the default ModsPath is used.</string>
<string id="NotificationLevel">Notification Level</string> <string id="NotificationLevel">Notification Level</string>
<string id="NotificationLevel_Explain">If this policy is enabled, you can configure Notification Level: Full (Default, displays all notifications), SuccessOnly (Only displays notifications for success) or None (Does not display any notification). <string id="NotificationLevel_Explain">If this policy is enabled, you can configure the Notification Level:
If this policy is not configured or disabled, the default displays all notifications.</string> 1. Full (Default, displays all notifications)
2. SuccessOnly (Only displays notifications for success)
3. None (Does not display any notification)
If this policy is not configured or disabled, the Default displays all notifications (1. Full).</string>
<string id="NotificationLevel_Full">1. Full (Default, displays all notifications)</string> <string id="NotificationLevel_Full">1. Full (Default, displays all notifications)</string>
<string id="NotificationLevel_SuccessOnly">2. SuccessOnly (Only displays notifications for success)</string> <string id="NotificationLevel_SuccessOnly">2. SuccessOnly (Only displays notifications for success)</string>
<string id="NotificationLevel_None">3. None (Does not display any notification)</string> <string id="NotificationLevel_None">3. None (Does not display any notification)</string>

View File

@ -144,10 +144,10 @@ if (Test-Network) {
#Get External ListPath if System #Get External ListPath if System
if ($WAUConfig.WAU_ListPath) { if ($WAUConfig.WAU_ListPath) {
Write-Log "WAU uses External Lists from: $($WAUConfig.WAU_ListPath)" Write-Log "WAU uses External Lists from: $($WAUConfig.WAU_ListPath.TrimEnd(" ", "\", "/"))"
$NewList = Test-ListPath $WAUConfig.WAU_ListPath $WAUConfig.WAU_UseWhiteList $WAUConfig.InstallLocation $NewList = Test-ListPath $WAUConfig.WAU_ListPath.TrimEnd(" ", "\", "/") $WAUConfig.WAU_UseWhiteList $WAUConfig.InstallLocation.TrimEnd(" ", "\")
if ($NewList) { if ($NewList) {
Write-Log "Newer List downloaded/copied to local path: $($WAUConfig.InstallLocation)" "Yellow" Write-Log "Newer List downloaded/copied to local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))" "Yellow"
} }
else { else {
if ((Test-Path "$WorkingDir\included_apps.txt") -or (Test-Path "$WorkingDir\excluded_apps.txt")) { if ((Test-Path "$WorkingDir\included_apps.txt") -or (Test-Path "$WorkingDir\excluded_apps.txt")) {
@ -163,10 +163,10 @@ if (Test-Network) {
#Get External ModsPath if System #Get External ModsPath if System
if ($WAUConfig.WAU_ModsPath) { if ($WAUConfig.WAU_ModsPath) {
Write-Log "WAU uses External Mods from: $($WAUConfig.WAU_ModsPath)" Write-Log "WAU uses External Mods from: $($WAUConfig.WAU_ModsPath.TrimEnd(" ", "\", "/"))"
$NewMods, $DeletedMods = Test-ModsPath $WAUConfig.WAU_ModsPath $WAUConfig.InstallLocation $NewMods, $DeletedMods = Test-ModsPath $WAUConfig.WAU_ModsPath.TrimEnd(" ", "\", "/") $WAUConfig.InstallLocation.TrimEnd(" ", "\")
if ($NewMods -gt 0) { if ($NewMods -gt 0) {
Write-Log "$NewMods newer Mods downloaded/copied to local path: $($WAUConfig.InstallLocation)\mods" "Yellow" Write-Log "$NewMods newer Mods downloaded/copied to local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))\mods" "Yellow"
} }
else { else {
if (Test-Path "$WorkingDir\mods\*.ps1") { if (Test-Path "$WorkingDir\mods\*.ps1") {
@ -177,7 +177,7 @@ if (Test-Network) {
} }
} }
if ($DeletedMods -gt 0) { if ($DeletedMods -gt 0) {
Write-Log "$DeletedMods Mods deleted (not externally managed) from local path: $($WAUConfig.InstallLocation)\mods" "Red" Write-Log "$DeletedMods Mods deleted (not externally managed) from local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))\mods" "Red"
} }
} }
} }