Skip to content

Commit 9cd4e80

Browse files
committed
use nuget packages path and fix pwsh behavior
1 parent cb47632 commit 9cd4e80

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Scripts/post_build.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ function Build-Path {
3333

3434
function Copy-Resources ($path) {
3535
# making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
36-
Copy-Item -Force $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe $path\Output\Update.exe
36+
Copy-Item -Force $env:NUGET_PACKAGES\squirrel.windows\1.5.2\tools\Squirrel.exe $path\Output\Update.exe
3737
}
3838

3939
function Delete-Unused ($path, $config) {
4040
$target = "$path\Output\$config"
4141
$included = Get-ChildItem $target -Filter "*.dll"
4242
foreach ($i in $included){
43-
$deleteList = Get-ChildItem $target\Plugins -Include $i -Recurse | Where { $_.VersionInfo.FileVersion -eq $i.VersionInfo.FileVersion -And $_.Name -eq "$i" }
43+
$deleteList = Get-ChildItem $target\Plugins -Filter $i.Name -Recurse | Where { $_.VersionInfo.FileVersion -eq $i.VersionInfo.FileVersion -And $_.Name -eq $i.Name }
4444
$deleteList | ForEach-Object{ Write-Host Deleting duplicated $_.Name with version $_.VersionInfo.FileVersion at location $_.Directory.FullName }
4545
$deleteList | Remove-Item
4646
}
@@ -72,14 +72,14 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
7272
Write-Host "Input path: $input"
7373

7474
# dotnet pack is not used because ran into issues, need to test installation and starting up if to use it.
75-
nuget pack $spec -Version $version -BasePath $input -OutputDirectory $output -Properties Configuration=Release
75+
dotnet pack $spec -Version $version -BasePath $input -OutputDirectory $output -Properties Configuration=Release
7676

7777
$nupkg = "$output\FlowLauncher.$version.nupkg"
7878
Write-Host "nupkg path: $nupkg"
7979
$icon = "$path\Flow.Launcher\Resources\app.ico"
8080
Write-Host "icon: $icon"
8181
# Squirrel.com: https://github.com/Squirrel/Squirrel.Windows/issues/369
82-
New-Alias Squirrel $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe -Force
82+
New-Alias Squirrel $env:NUGET_PACKAGES\squirrel.windows\1.5.2\tools\Squirrel.exe -Force
8383
# why we need Write-Output: https://github.com/Squirrel/Squirrel.Windows/issues/489#issuecomment-156039327
8484
# directory of releaseDir in squirrel can't be same as directory ($nupkg) in releasify
8585
$temp = "$output\Temp"

0 commit comments

Comments
 (0)