Skip to content

Commit 5a7561b

Browse files
committed
PE-38219 - Installer - Windows as Jump host support - passing params to ps1 files correctly
1 parent bd80892 commit 5a7561b

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

plans/util/retrieve_and_upload.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
$result_size = run_task('peadm::filesize', 'local://localhost',
4545
path => $local_path,
4646
)
47-
$local_size = $result_size['size']
47+
$local_size = $result_size.first.value['_output']
4848
} else {
4949
$exists = without_default_logging() || {
5050
run_command("test -e '${local_path}'", 'local://localhost',

tasks/download.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
},
2323
"implementations": [
2424
{"name": "download.sh", "requirements": ["shell"], "input_method": "environment"},
25-
{"name": "download.ps1", "requirements": ["powershell"]}
26-
]
25+
{"name": "download.ps1", "requirements": ["powershell"], "input_method": "powershell"}
26+
]
2727
}

tasks/download.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# dowload.ps1
1+
# download.ps1
22
Param(
33
$source,
44
$path

tasks/filesize.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
},
99
"implementations": [
1010
{"name": "filesize.sh", "requirements": ["shell"], "input_method": "environment"},
11-
{"name": "filesize.ps1", "requirements": ["powershell"]}
11+
{"name": "filesize.ps1", "requirements": ["powershell"], "input_method": "powershell"}
1212
]
1313
}

tasks/filesize.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ try {
2020
Write-Host "{'size': '$size'}"
2121
}
2222

23-
return @{ size = $size }
23+
return $size
24+
2425
}catch {
2526
Write-Host "Installer failed with Exception: $_.Exception.Message"
2627
Exit 1

0 commit comments

Comments
 (0)