Skip to content

Fix Windows install: route Git Bash to PS1, pin tar to bsdtar #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yyy900 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Windows install: route Git Bash to PS1, pin tar to bsdtar #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ if (-not (Test-Path $CoPy)) {
$tarball = Join-Path $CoEnv $asset
Invoke-WebRequest -Uri $url -OutFile $tarball -UseBasicParsing
# tarball contains a top-level "python\" directory.
tar -xzf $tarball -C $CoEnv
# GNU tar from Git Bash on PATH parses the "C:" as a remote host; pin to Windows' bsdtar.
$tarExe = Join-Path $env:SystemRoot 'System32\tar.exe'
if (-not (Test-Path $tarExe)) { $tarExe = 'tar' }
& $tarExe -xzf $tarball -C $CoEnv
Remove-Item -Force $tarball
if (-not (Test-Path $CoPy)) { Write-Fail "python bootstrap failed: $CoPy not found after extract" }
}
Expand Down
4 changes: 4 additions & 0 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ if [ ! -x "$CO_PY" ]; then
case "$uname_s" in
Darwin) TRIPLE="$ARCH-apple-darwin" ;;
Linux) TRIPLE="$ARCH-unknown-linux-gnu" ;;
MINGW*|MSYS*|CYGWIN*)
red "Windows detected (Git Bash/MSYS). Use the PowerShell installer instead:"
red ' irm https://raw.githubusercontent.com/openonion/oo/main/install.ps1 | iex'
exit 1 ;;
*) red "unsupported platform: $uname_s/$uname_m"; exit 1 ;;
esac
ASSET="cpython-${PBS_PYTHON}+${PBS_RELEASE}-${TRIPLE}-install_only.tar.gz"
Expand Down