From 43c4674fd93e42baa50bf4b6cde3b8707a513114 Mon Sep 17 00:00:00 2001
From: Alex Sarafian <dev1978@outlook.com>
Date: Wed, 14 Dec 2016 15:12:14 +0100
Subject: [PATCH] Bug fixes (#37)

- Bug fixes
- Enhancements
---
 CHANGELOG.Examples.md                         |   1 +
 Examples/Copy-ISHCD.NotReleased.ps1           |   8 +++--
 .../ISHDeploy/Demo-Test for ISHBootstrap.zip  | Bin 0 -> 2321 bytes
 ...et-ISHCMMenuAndButton.ImplicitRemoting.ps1 |  11 +++---
 Examples/ISHDeploy/Set-ISHCMMenuAndButton.ps1 |  12 +++----
 .../Grant-ISHUserLogOnAsService.ps1           |  34 +++++++++++-------
 .../Modules/xISHServer/Initialize-ISHUser.ps1 |   2 +-
 ...ut CredSSP authentication for PSSession.md |   4 +++
 8 files changed, 44 insertions(+), 28 deletions(-)
 create mode 100644 Examples/ISHDeploy/Demo-Test for ISHBootstrap.zip

diff --git a/CHANGELOG.Examples.md b/CHANGELOG.Examples.md
index c6e0437..e2e3c10 100644
--- a/CHANGELOG.Examples.md
+++ b/CHANGELOG.Examples.md
@@ -9,6 +9,7 @@
 - When executing script `Initialize-ISHServer.ps1` locally, all **xISHServer.\*** loaded instances are removed and the correct **xISHServer.Y** is automatically imported.
 - Enhanced progress indicators in scripts.
 - Changes in the JSON structure regarding WinRM secure.
+- Enhanced script `Set-ISHCMMenuAndButton.ps1` and `Set-ISHCMMenuAndButton.ImplicitRemoting.ps1` to align with the recent changes of ISHDeploy modules.
 
 ## pre-release v0.3
 
diff --git a/Examples/Copy-ISHCD.NotReleased.ps1 b/Examples/Copy-ISHCD.NotReleased.ps1
index 9f416e6..ea2d61f 100644
--- a/Examples/Copy-ISHCD.NotReleased.ps1
+++ b/Examples/Copy-ISHCD.NotReleased.ps1
@@ -26,7 +26,6 @@ $scriptsPaths="$sourcePath\Scripts"
 $computerName=Get-ISHBootstrapperContextValue -ValuePath "ComputerName" -DefaultValue $null
 $credential=Get-ISHBootstrapperContextValue -ValuePath "CredentialExpression" -Invoke
 $ishVersion=Get-ISHBootstrapperContextValue -ValuePath "ISHVersion"
-$ishServerVersion=($ishVersion -split "\.")[0]
 
 . "$cmdletsPaths\Helpers\Invoke-CommandWrap.ps1"
 
@@ -37,11 +36,11 @@ $copyBlock= {
     Write-Debug "targetPath=$targetPath"
 
     $cdObject=((Get-ChildItem $internalCDFolder |Where-Object{Test-Path $_.FullName -PathType Leaf}| Sort-Object FullName -Descending)[0])
-    Write-Debug "cdObject=$($cdObject.FullName)"
+    Write-Verbose "Found latest release $($cdObject.FullName)"
 
     Copy-Item $cdObject.FullName $env:TEMP
     $cdPath=Join-Path $env:TEMP $cdObject.Name
-    Write-Debug "Copied file $($cdObject.FullName) to $cdPath"
+    Write-Verbose "Copied file $($cdObject.FullName) to $cdPath"
 
     Write-Debug "targetPath=$targetPath"
     if(-not (Test-Path $targetPath))
@@ -51,6 +50,8 @@ $copyBlock= {
     Remove-Item "$targetPath\*" -Force -Recurse
     Write-Verbose "$targetPath is ready"
 
+    $ishServerVersion=($ishVersion -split "\.")[0]
+    Write-Debug "ishServerVersion=$ishServerVersion"
     if($ISHServerVersion -eq "12") 
     {
         $arguments=@("-d$targetPath","-s")
@@ -63,6 +64,7 @@ $copyBlock= {
             "-InstallPath=`"$($targetPath.Replace('\','\\'))`"" 
         )
     }
+    Write-Debug "arguments=$($arguments -join " ")"
 
     Write-Debug "Unzipping $cdPath in $targetPath"
     Start-Process $cdPath -ArgumentList $arguments -Wait
diff --git a/Examples/ISHDeploy/Demo-Test for ISHBootstrap.zip b/Examples/ISHDeploy/Demo-Test for ISHBootstrap.zip
new file mode 100644
index 0000000000000000000000000000000000000000..aae9891b8d4a1ee13385be8fbd4e818c22d70e60
GIT binary patch
literal 2321
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

literal 0
HcmV?d00001

diff --git a/Examples/ISHDeploy/Set-ISHCMMenuAndButton.ImplicitRemoting.ps1 b/Examples/ISHDeploy/Set-ISHCMMenuAndButton.ImplicitRemoting.ps1
index 5a599df..a52dbeb 100644
--- a/Examples/ISHDeploy/Set-ISHCMMenuAndButton.ImplicitRemoting.ps1
+++ b/Examples/ISHDeploy/Set-ISHCMMenuAndButton.ImplicitRemoting.ps1
@@ -25,6 +25,8 @@ param (
     [string]$ISHVersion    
 )
 $ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
+$ishBootStrapRootPath="C:\GitHub\ISHBootstrap"
+
 $cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
 $scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
 
@@ -52,17 +54,14 @@ try
         $remote=Add-ModuleFromRemote -ComputerName $Computer -Credential $Credential -Name $ishDelpoyModuleName
     }
 
-    # Create a new tab for CUSTOM event types
     $hash=@{
         Label="Custom Event"
         Description="Show all custom events"
         EventTypesFilter=@("CUSTOM1","CUSTOM2")
         UserRole=@("Administrator","Author")
     }
-    Set-ISHUIEventMonitorTab -ISHDeployment $DeploymentName @hash
-    Move-ISHUIEventMonitorTab -ISHDeployment $DeploymentName -Label $hash["Label"] -First
-    Write-Host "Event monitor tab created"
-
+    Set-ISHUIEventMonitorMenuBarItem -ISHDeployment $DeploymentName @hash
+    Move-ISHUIEventMonitorMenuBarItem -ISHDeployment $DeploymentName -Label $hash["Label"] -First
 }
 finally
 {
@@ -73,4 +72,4 @@ finally
 }
 
 Write-Progress @scriptProgress -Completed
-Write-Separator -Invocation $MyInvocation -Footer -Name "Configure"
+Write-Separator -Invocation $MyInvocation -Footer -Name "Configure"
\ No newline at end of file
diff --git a/Examples/ISHDeploy/Set-ISHCMMenuAndButton.ps1 b/Examples/ISHDeploy/Set-ISHCMMenuAndButton.ps1
index 4ddc7f4..e082d08 100644
--- a/Examples/ISHDeploy/Set-ISHCMMenuAndButton.ps1
+++ b/Examples/ISHDeploy/Set-ISHCMMenuAndButton.ps1
@@ -23,6 +23,8 @@ param (
     [string]$DeploymentName
 )
 $ishBootStrapRootPath=Resolve-Path "$PSScriptRoot\..\.."
+$ishBootStrapRootPath="C:\GitHub\ISHBootstrap"
+
 $cmdletsPaths="$ishBootStrapRootPath\Source\Cmdlets"
 $scriptsPaths="$ishBootStrapRootPath\Source\Scripts"
 
@@ -43,25 +45,23 @@ if(-not (Get-Command Invoke-CommandWrap -ErrorAction SilentlyContinue))
 }        
 
 $setUIFeaturesScirptBlock= {
-    # Create a new tab for CUSTOM event types
     $hash=@{
         Label="Custom Event"
         Description="Show all custom events"
         EventTypesFilter=@("CUSTOM1","CUSTOM2")
         UserRole=@("Administrator","Author")
     }
-    Set-ISHUIEventMonitorTab -ISHDeployment $DeploymentName @hash
-    Move-ISHUIEventMonitorTab -ISHDeployment $DeploymentName -Label $hash["Label"] -First
-    Write-Host "Event monitor tab created"
+    Set-ISHUIEventMonitorMenuBarItem -ISHDeployment $DeploymentName @hash
+    Move-ISHUIEventMonitorMenuBarItem -ISHDeployment $DeploymentName -Label $hash["Label"] -First
 }
 
 
 #Install the packages
 try
 {
-    $blockName="Set UI Features on $DeploymentName"
+    $blockName="Setting UI Features on $DeploymentName"
     Write-Progress @scriptProgress -Status $blockName
-    Invoke-CommandWrap -ComputerName $Computer -Credential $Credential -ScriptBlock $setUIFeaturesScirptBlock -BlockName $blockName -UseParameters @("DeploymentName")
+    Invoke-CommandWrap -ComputerName $Computer -Credential $Credential -ScriptBlock $setUIFeaturesScirptBlock -BlockName "Set UI Features on $DeploymentName" -UseParameters @("DeploymentName")
 }
 finally
 {
diff --git a/Source/Modules/xISHServer/Grant-ISHUserLogOnAsService.ps1 b/Source/Modules/xISHServer/Grant-ISHUserLogOnAsService.ps1
index 67868e0..6b3bfbe 100644
--- a/Source/Modules/xISHServer/Grant-ISHUserLogOnAsService.ps1
+++ b/Source/Modules/xISHServer/Grant-ISHUserLogOnAsService.ps1
@@ -18,11 +18,22 @@ function Grant-ISHUserLogOnAsService{
 param(
     [string[]] $User
     )
-    
-
+    $tempExportInfPath=Join-Path $env:TEMP tempexport.inf
+    $tempSECEditPath=Join-Path $env:TEMP secedit.sdb
+    $tempExportInfPath=Join-Path $env:TEMP tempexport.inf
+    if(Test-Path $tempExportInfPath)
+    {
+        Write-Warning "Removing $tempExportInfPath"
+        Remove-Item -Path $tempExportInfPath -Force
+    } 
+    if(Test-Path $tempSECEditPath)
+    {
+        Write-Warning "Removing $tempSECEditPath"
+        Remove-Item -Path $tempSECEditPath -Force
+    } 
     #Get list of currently used SIDs 
-    secedit /export /cfg tempexport.inf 
-    $curSIDs = Select-String .\tempexport.inf -Pattern "SeServiceLogonRight" 
+    & secedit /export /cfg $tempExportInfPath 
+    $curSIDs = Select-String $tempExportInfPath -Pattern "SeServiceLogonRight" 
     $Sids = $curSIDs.line 
     $sidstring = ""
     foreach($user in $User){
@@ -35,13 +46,13 @@ param(
     if($sidstring){
         $newSids = $sids + $sidstring
         Write-Host "New Sids: $newSids"
-        $tempinf = Get-Content tempexport.inf
+        $tempinf = Get-Content $tempExportInfPath
         $tempinf = $tempinf.Replace($Sids,$newSids)
-        Add-Content -Path tempimport.inf -Value $tempinf
-        secedit /import /db secedit.sdb /cfg ".\tempimport.inf" 
-        secedit /configure /db secedit.sdb 
+        Add-Content -Path $tempExportInfPath -Value $tempinf
+        & secedit /import /db secedit.sdb /cfg $tempExportInfPath 
+        & secedit /configure /db secedit.sdb 
  
-        gpupdate /force 
+        & gpupdate /force 
     }
     else{
         Write-Host "No new sids"
@@ -49,8 +60,7 @@ param(
 
     
  
-    Remove-Item ".\tempimport.inf" -force -ErrorAction SilentlyContinue
-    Remove-Item ".\secedit.sdb" -force -ErrorAction SilentlyContinue
-    Remove-Item ".\tempexport.inf" -force
+    Remove-Item $tempSECEditPath -force -ErrorAction SilentlyContinue
+    Remove-Item $tempExportInfPath -force -ErrorAction SilentlyContinue
 
 }
diff --git a/Source/Modules/xISHServer/Initialize-ISHUser.ps1 b/Source/Modules/xISHServer/Initialize-ISHUser.ps1
index 9915fc5..eb24f4b 100644
--- a/Source/Modules/xISHServer/Initialize-ISHUser.ps1
+++ b/Source/Modules/xISHServer/Initialize-ISHUser.ps1
@@ -28,7 +28,7 @@ function Initialize-ISHUser
     if(Get-Module "Microsoft.PowerShell.LocalAccounts" -ListAvailable)
     {
         # https://technet.microsoft.com/en-us/library/mt651690.aspx
-        if(-not (Get-LocalGroupMember -Name Administrators -Member $OSUser))
+        if(-not (Get-LocalGroupMember -Name Administrators -Member $OSUser -ErrorAction SilentlyContinue))
         {
             Add-LocalGroupMember -Group "Administrators" -Member $OSUser
         }
diff --git a/Tutorials/About CredSSP authentication for PSSession.md b/Tutorials/About CredSSP authentication for PSSession.md
index 2b4033c..fbdf38d 100644
--- a/Tutorials/About CredSSP authentication for PSSession.md	
+++ b/Tutorials/About CredSSP authentication for PSSession.md	
@@ -30,6 +30,10 @@ You will get this error
 To enable the feature either follow the steps described in the error or execute this
 
 ```powershell
+$service=Get-Service -Name WinRm
+$service.StartType="Automatic"
+$service|Set-Service 
+Start-Service  -Name WinRm
 Enable-WSManCredSSP -Role client -DelegateComputer *.domain.com
 ```