Skip to content

Commit

Permalink
Merge pull request #65 from Sarafian/develop
Browse files Browse the repository at this point in the history
From develop to master for version 1.0
  • Loading branch information
Sarafian authored Apr 19, 2017
2 parents 64db47c + 7c5cfa7 commit 7c74f70
Show file tree
Hide file tree
Showing 111 changed files with 4,715 additions and 119 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/Packer/output-hyperv-iso
**/Packer/packer_cache
8 changes: 7 additions & 1 deletion CHANGELOG.Examples.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Examples Change log

## release v1.0

- GH-58: Configure RequireSSL attribute for ISHCM and ISHSTS web applications. After installing the web applications are configured for the **RequireSSL**.
- GH-57: Load-ISHBootstrapperContext.ps1 fails to load json file when using Name parameter set.
- GH-62: Use ISHServer cmdlets that manage the user profile

## pre-release v0.8

- GH-45 and GH-46: Azure file and blob storage support.
Expand Down Expand Up @@ -102,4 +108,4 @@ To align with the major changes in Source:

**20160727**

- Removed topic `About example script`
- Removed topic `About example script`
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Change log

## release v1.0

- GH-54: Add support for Amazon Web Services EC2 AMI.
- GH-55: Add support for Vagrant boxes (Hyper-V).
- GH-53: Add support for docker container images.
- GH-58: Configure RequireSSL attribute for ISHCM and ISHSTS web applications. Script `Set-IISRequireSSL.ps1` is added.
- GH-50: Import ISHTemplate repository as a Builders folder. ISHBootstrap provides builder scripts for use with AWS EC2 AMI, Docker containers, Packer and Vagrant.
- GH-62: Use ISHServer cmdlets that manage the user profile

Known issues:

- GH-53: Add support for docker container images. Requires some fine-tuning

## pre-release v0.8

- GH-44: ISHBootstrap is not Set-StrictMode combatible.
Expand Down Expand Up @@ -151,4 +164,4 @@

**20160712**

- Initial commit. Describing the repository.
- Initial commit. Describing the repository.
4 changes: 2 additions & 2 deletions Examples/Clean-ISH.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if ($PSBoundParameters['Debug']) {

$sourcePath=Resolve-Path "$PSScriptRoot\..\Source"
$cmdletsPaths="$sourcePath\Cmdlets"
$scriptsPaths="$sourcePath\Scripts"
$serverScriptsPaths="$sourcePath\Server"

. "$PSScriptRoot\Cmdlets\Get-ISHBootstrapperContextValue.ps1"
$computerName=Get-ISHBootstrapperContextValue -ValuePath "ComputerName" -DefaultValue $null
Expand Down Expand Up @@ -70,7 +70,7 @@ try

if(-not $computerName)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}
Invoke-CommandWrap -ComputerName $computerName -Credential $credential -ScriptBlock $cleanBlock -BlockName "Clean ISH" -UseParameters @("ishVersion","ishServerVersion")

Expand Down
14 changes: 7 additions & 7 deletions Examples/Copy-ISHCD.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if ($PSBoundParameters['Debug']) {

$sourcePath=Resolve-Path "$PSScriptRoot\..\Source"
$cmdletsPaths="$sourcePath\Cmdlets"
$scriptsPaths="$sourcePath\Scripts"
$serverScriptsPaths="$sourcePath\Server"

. "$PSScriptRoot\Cmdlets\Get-ISHBootstrapperContextValue.ps1"
. "$PSScriptRoot\Cmdlets\Get-ISHBootstrapperContextSource.ps1"
Expand All @@ -30,7 +30,7 @@ $computerName=Get-ISHBootstrapperContextValue -ValuePath "ComputerName" -Default
$credential=Get-ISHBootstrapperContextValue -ValuePath "CredentialExpression" -Invoke
if(-not $computerName)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

$ishVersion=Get-ISHBootstrapperContextValue -ValuePath "ISHVersion"
Expand All @@ -46,25 +46,25 @@ if($unc)
{
$internalCDFolder=$unc.ISHCDFolder
$cdObject=((Get-ChildItem $internalCDFolder |Where-Object{Test-Path $_.FullName -PathType Leaf}| Sort-Object FullName -Descending)[0])
& $scriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FilePath $cdObject.FullName
& $serverScriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FilePath $cdObject.FullName
}
if($ftp)
{
$ftpPath="$($ftp.ISHCDFolder)$($ftp.ISHCDFileName)"
& $scriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FTPHost $ftp.Host -FTPCredential $ftp.Credential -FTPPath $ftpPath
& $serverScriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FTPHost $ftp.Host -FTPCredential $ftp.Credential -FTPPath $ftpPath
}
if($awss3)
{
$key="$($awss3.ISHCDFolderKey)$($awss3.ISHCDFileName)"
& $scriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -BucketName $awss3.BucketName -Key $key -AccessKey $awss3.AccessKey -SecretKey $awss3.SecretKey
& $serverScriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -BucketName $awss3.BucketName -Key $key -AccessKey $awss3.AccessKey -SecretKey $awss3.SecretKey
}
if($azurefilestorage)
{
$path="$($azurefilestorage.ISHCDFolderPath)$($azurefilestorage.ISHCDFileName)"
& $scriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -ShareName $azurefilestorage.ShareName -Path $path -StorageAccountName $azurefilestorage.StorageAccountName -StorageAccountKey $azurefilestorage.StorageAccountKey
& $serverScriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -ShareName $azurefilestorage.ShareName -Path $path -StorageAccountName $azurefilestorage.StorageAccountName -StorageAccountKey $azurefilestorage.StorageAccountKey
}
if($azureblobstorage)
{
$path="$($azureblobstorage.ISHCDFolderPath)$($azureblobstorage.ISHCDFileName)"
& $scriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -ContainerName $azureblobstorage.ContainerName -BlobName $path -StorageAccountName $azureblobstorage.StorageAccountName -StorageAccountKey $azureblobstorage.StorageAccountKey
& $serverScriptsPaths\ISHServer\Copy-ISHCD.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -ContainerName $azureblobstorage.ContainerName -BlobName $path -StorageAccountName $azureblobstorage.StorageAccountName -StorageAccountKey $azureblobstorage.StorageAccountKey
}
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Get-Status.ImplicitRemoting.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Write-Separator -Invocation $MyInvocation -Header -Name "Configure"
Expand All @@ -35,7 +35,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

. $cmdletsPaths\Helpers\Add-ModuleFromRemote.ps1
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Get-Status.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Write-Separator -Invocation $MyInvocation -Header -Name "Configure"
Expand All @@ -33,7 +33,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

. $ishBootStrapRootPath\Examples\Cmdlets\Get-ISHBootstrapperContextValue.ps1
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-ADFSIntegrationISH.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\Cmdlets\Get-ISHBootstrapperContextValue.ps1
. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Expand All @@ -36,7 +36,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-ISHCMComponents.ImplicitRemoting.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\Cmdlets\Get-ISHBootstrapperContextValue.ps1
. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Expand All @@ -36,7 +36,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

. $cmdletsPaths\Helpers\Add-ModuleFromRemote.ps1
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-ISHCMComponents.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\Cmdlets\Get-ISHBootstrapperContextValue.ps1
. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Expand All @@ -34,7 +34,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$ishBootStrapRootPath="C:\GitHub\ISHBootstrap"

$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\Cmdlets\Get-ISHBootstrapperContextValue.ps1
. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Expand All @@ -38,7 +38,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

. $cmdletsPaths\Helpers\Add-ModuleFromRemote.ps1
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-ISHCMMenuAndButton.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$ishBootStrapRootPath="C:\GitHub\ISHBootstrap"

$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\Cmdlets\Get-ISHBootstrapperContextValue.ps1
. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Expand All @@ -36,7 +36,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\Cmdlets\Get-ISHBootstrapperContextValue.ps1
. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Expand All @@ -38,7 +38,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

. $cmdletsPaths\Helpers\Add-ModuleFromRemote.ps1
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-ISHIntegrationADFS.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\Cmdlets\Get-ISHBootstrapperContextValue.ps1
. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Expand All @@ -36,7 +36,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Write-Separator -Invocation $MyInvocation -Header -Name "Configure"
Expand All @@ -35,7 +35,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

. $cmdletsPaths\Helpers\Add-ModuleFromRemote.ps1
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-ISHSTSRelyingParty.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Write-Separator -Invocation $MyInvocation -Header -Name "Configure"
Expand All @@ -33,7 +33,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-ISHSTSWindows.ImplicitRemoting.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Write-Separator -Invocation $MyInvocation -Header -Name "Configure"
Expand All @@ -35,7 +35,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

. $cmdletsPaths\Helpers\Add-ModuleFromRemote.ps1
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-ISHSTSWindows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Write-Separator -Invocation $MyInvocation -Header -Name "Configure"
Expand All @@ -33,7 +33,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Write-Separator -Invocation $MyInvocation -Header -Name "Configure"
Expand All @@ -35,7 +35,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

. $cmdletsPaths\Helpers\Add-ModuleFromRemote.ps1
Expand Down
4 changes: 2 additions & 2 deletions Examples/ISHDeploy/Set-InternalAuthentication.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ param (
)
$ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
$cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
$scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
$serverScriptsPaths="$ishBootStrapRootPath\Source\Server"

. $ishBootStrapRootPath\Examples\ISHDeploy\Cmdlets\Write-Separator.ps1
Write-Separator -Invocation $MyInvocation -Header -Name "Configure"
Expand All @@ -33,7 +33,7 @@ $scriptProgress=Get-ProgressHash -Invocation $MyInvocation

if(-not $Computer)
{
& "$scriptsPaths\Helpers\Test-Administrator.ps1"
& "$serverScriptsPaths\Helpers\Test-Administrator.ps1"
}

if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
Expand Down
Loading

0 comments on commit 7c74f70

Please sign in to comment.