Skip to content

Commit a1f4e5a

Browse files
authored
Merge pull request #35 from dscho/fix-update-via-pacman.ps1
Fix `update-via-pacman.ps1`
2 parents ff41414 + 1373739 commit a1f4e5a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

update-via-pacman.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ function die {
2323
Set-Location $PSScriptRoot
2424
if (!$?) { die "Could not switch directory to $PSScriptRoot" }
2525

26-
$env:PATH = "$(Get-Location)\usr\bin;" + $env:PATH
26+
$env:PATH = "$(Get-Location)\mingw32\bin;$(Get-Location)\usr\bin;" + $env:PATH
2727

2828
# Set to MSYS mode
29-
$env:MSYSTEM = "MSYS"
29+
$env:MSYSTEM = "MINGW32"
3030
$env:MSYS2_PATH_TYPE = "minimal"
3131

3232
# Create /var/log/ so that pacman.log is written
@@ -148,7 +148,8 @@ if ($pacnew.Length -gt 0) {
148148
}
149149
bash -lc @"
150150
set -x &&
151-
. /var/lib/pacman/local/mingw-w64-*-git-extra-[0-9]*/install 2>/dev/null &&
151+
. /var/lib/pacman/local/mingw-w64-*-git-extra-[0-9]*/install &&
152+
cd / &&
152153
post_upgrade
153154
"@
154155
}

0 commit comments

Comments
 (0)