Skip to content

Commit 804d2a5

Browse files
committed
-
1 parent a831bd6 commit 804d2a5

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ jobs:
8787
shell: pwsh
8888
run: |
8989
iwr "https://www.7-zip.org/a/7z$($env:VERSION_7ZIP.Replace('.', ''))-x64.exe" -OutFile D:\7zip.exe
90-
Start-Process -Wait D:\7zip.exe -ArgumentList /S, /D=$PWD\7zip\app
90+
Start-Process -Wait D:\7zip.exe -ArgumentList /S, /D=.\7zip\app
9191
# just a stub manifest, will be replaced later
92-
Set-Content $PWD\7zip\pog.psd1 '@{Private = $true; Enable = {Export-Command "7z" "./app/7z.exe" -VcRedist}}'
92+
Set-Content .\7zip\pog.psd1 '@{Private = $true; Enable = {Export-Command "7z" "./app/7z.exe" -VcRedist}}'
9393
9494
- name: Verify build dependencies
9595
shell: pwsh
@@ -133,6 +133,7 @@ jobs:
133133
# add to PATH for following steps
134134
Add-Content $env:GITHUB_PATH (Resolve-Path .\data\package_bin)
135135
136+
# reinstall 7zip with correct manifest
136137
pog 7zip -Force
137138
138139

app/Pog/Pog.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ function Get-PogDownloadCache {
245245

246246
process {
247247
foreach ($pn in $PackageName) {
248-
$Result = $Entries | ListEntries {$_.PackageName -eq $pn}
248+
$Result = $Entries | ListEntries {$_.PackageName -eq $pn} | sort Version -Descending
249249
if ($Result) {
250250
echo $Result
251251
} else {
@@ -255,4 +255,4 @@ function Get-PogDownloadCache {
255255
}
256256
}
257257
}
258-
}
258+
}

app/Pog/container/Env_UpdateRepository.psm1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ function Get-HashFromChecksumText {
189189
}
190190
}
191191

192+
# FIXME: shouldn't this be called something like Get-HashFromChecksumUrl?
192193
function Get-HashFromChecksumFile {
193194
### .SYNOPSIS
194195
### Retrieves `$Uri`, parses the text as a shasum-like checksum file and retrieves the hash for `$FileName` or `$Pattern`.

0 commit comments

Comments
 (0)