GH-53 & GH-54 & GH-55: Improvements

RWS · Apr 7, 2017 · 4e68928 · 4e68928
1 parent 4f4b0eb
commit 4e68928
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/Source/Server/Install/Install-ISHDeployment.ps1 b/Source/Server/Install/Install-ISHDeployment.ps1
@@ -319,6 +319,19 @@ $newParameterScriptBlock={
 }
 
 $installScriptBlock={
+    [int]$major=($ISHVersion -split '\.')[0]
+    if($major -ge 13)
+    {
+        # Fixing JAVA_HOME not set because we didn't restart
+        $envVarName="JAVA_HOME"
+        if(-not (Get-Item -Path ENV:\$envVarName -ErrorAction SilentlyContinue))
+        {
+            $value=Get-ChildItem -Path $Env:ProgramFiles\Java |Sort-Object -Property Name -Descending|Select-Object -First 1 -ExpandProperty Name
+            Set-Item -Path ENV:\$envVarName -Value $value
+            Write-Warning "Environment variable $envVarName could not be retrieved. Setting to $value"
+        }
+    }
+
     $fileName="inputparameters-$Name.xml"
     $folderPath=Resolve-Path "$CDPath\.."
     $inputParametersPathPath=Join-Path $folderPath $fileName
@@ -347,7 +360,7 @@ try
 
     $blockName="Installing $Name"
     Write-Progress @scriptProgress -Status $blockName
-    Invoke-CommandWrap -ComputerName $Computer -Credential $Credential -ScriptBlock $installScriptBlock -BlockName $blockName -UseParameters @("cdPath","Name")
+    Invoke-CommandWrap -ComputerName $Computer -Credential $Credential -ScriptBlock $installScriptBlock -BlockName $blockName -UseParameters @("cdPath","ISHVersion","Name")
 }
 catch
 {