PE-38219 - Installer - Windows as Jump host support - fixing os detection

Author: cathal41

plans/util/retrieve_and_upload.pp

@@ -30,9 +30,9 @@
     # lint:endignore
 
 $operating_system = run_task('peadm::os_identification', 'local://localhost')
-$os_string = $operating_system.first.value['osfamily']
+$os_string =$operating_system.first.value['_output']
 
-if os_string  == 'windows' {
+if 'windows' in $os_string {
   $exists = run_command("[System.IO.File]::Exists('${local_path}')", 'local://localhost')
   if $exists.first['stdout'].chomp == 'false' {
     run_task('peadm::download', 'local://localhost',

tasks/os_identification.ps1

@@ -11,7 +11,7 @@ try {
         $osfamily = "unknown"
     }
 
-    return @{ osfamily = $osfamily }
+    return $osfamily
 }catch {
   Write-Host "Installer failed with Exception: $_.Exception.Message"
   Exit 1

tasks/os_identification.sh

@@ -14,5 +14,5 @@ else
         osfamily="unknown"
 fi
 
-  echo '{ "osfamily": "'$osfamily'" }'
+  echo  $osfamily