emberkom/management-scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow null values for HaltIfRunning variable

Browse Source
This commit is contained in:
dyoder
2020-09-24 13:04:06 -04:00
parent 2d940adee9
commit 9f0a1076fd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools.ps1
+3 -2
View File
@@ -129,7 +129,7 @@ param(
#### $HaltIfRunning is a collection of app names which, if running, will prevent the script from running #### $HaltIfRunning is a collection of app names which, if running, will prevent the script from running
[Parameter(Mandatory=$false,ParameterSetName='live-ps')] [Parameter(Mandatory=$false,ParameterSetName='live-ps')]
[Parameter(Mandatory=$false,ParameterSetName='local')] [Parameter(Mandatory=$false,ParameterSetName='local')]
[string[]]$HaltIfRunning, [string[]]$HaltIfRunning='null',
#### $ForceClose will forcefully close all apps specified in $HaltIfRunning #### $ForceClose will forcefully close all apps specified in $HaltIfRunning
[Parameter(Mandatory=$false,ParameterSetName='live-ps')] [Parameter(Mandatory=$false,ParameterSetName='live-ps')]
[Parameter(Mandatory=$false,ParameterSetName='local')] [Parameter(Mandatory=$false,ParameterSetName='local')]
@@ -137,13 +137,14 @@ param(
) )
$LogName = $MyInvocation.MyCommand $LogName = $MyInvocation.MyCommand
If ( $Arguments -eq "null" ) { $Arguments = $null } If ( $Arguments -eq "null" ) { $Arguments = $null }
If ( $HaltIfRunning -eq "null" ) { $HaltIfRunning = $null }
If ( $LivePSScript ) If ( $LivePSScript )
{ {
$URL = "https://dev.emberkom.com/emberkom/${Type}/raw/branch/master/${LivePSScript}.ps1" $URL = "https://dev.emberkom.com/emberkom/${Type}/raw/branch/master/${LivePSScript}.ps1"
If ( !(IsURLValid -URL $URL) ) { Log "The specified script does not exist: ${LivePSScript}" -Name $LogName ; Exit } If ( !(IsURLValid -URL $URL) ) { Log "The specified script does not exist: ${LivePSScript}" -Name $LogName ; Exit }
} }
If ( $Path ) { If ( !(Test-Path $Path) ) { Log "The specified script does not exist: ${Path}" -Name $LogName ; Exit } } If ( $Path ) { If ( !(Test-Path $Path) ) { Log "The specified script does not exist: ${Path}" -Name $LogName ; Exit } }
If ( ($HaltIfRunning) -and ($ForceClose) -and ( !(IsAdmin) ) ) { Log "Cannot close dependent apps because this task does not have administrative privileges" -Name $LogName ; Exit } If ( ($HaltIfRunning -ne $null ) -and ($ForceClose) -and ( !(IsAdmin) ) ) { Log "Cannot close dependent apps because this task does not have administrative privileges" -Name $LogName ; Exit }
If ( $HaltIfRunning ) If ( $HaltIfRunning )
{ {
$Halt = $false $Halt = $false