Skip to content

Commit

Permalink
Use named parameters in powershell script
Browse files Browse the repository at this point in the history
  • Loading branch information
phw committed Sep 8, 2023
1 parent 7c7de58 commit 2a89c2e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions scripts/package/win-common.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ Function FinalizePackage {
$Path
)

CodeSignBinary (Join-Path $Path picard.exe)
CodeSignBinary (Join-Path $Path fpcalc.exe)
CodeSignBinary (Join-Path $Path discid.dll)
CodeSignBinary (Join-Path -Path $Path -ChildPath picard.exe)
CodeSignBinary (Join-Path -Path $Path -ChildPath fpcalc.exe)
CodeSignBinary (Join-Path -Path $Path -ChildPath discid.dll)

# Move all Qt5 DLLs into the main folder to avoid conflicts with system wide
# versions of those dependencies. Since some version PyInstaller tries to
# maintain the file hierarchy of imported modules, but this easily breaks
# DLL loading on Windows.
# Workaround for https://tickets.metabrainz.org/browse/PICARD-2736
$Qt5BinDir = (Join-Path $Path PyQt5 Qt5 bin)
Move-Item (Join-Path $Qt5BinDir *.dll) $Path -Force
Remove-Item $Qt5BinDir
$Qt5BinDir = (Join-Path -Path $Path -ChildPath PyQt5\Qt5\bin)
Move-Item -Path (Join-Path -Path $Qt5BinDir -ChildPath *.dll) -Destination $Path -Force
Remove-Item -Path $Qt5BinDir
}

0 comments on commit 2a89c2e

Please sign in to comment.