Skip to content

Commit 1cf3d02

Browse files
authored
Merge pull request #2951 from SpaceManiac/busybox-win
Support busybox-w32 in rustup-init.sh
2 parents d080411 + 35fc16c commit 1cf3d02

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

rustup-init.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ main() {
135135
exit 1
136136
fi
137137

138-
if [ "$need_tty" = "yes" ]; then
138+
if [ "$need_tty" = "yes" ] && [ ! -t 0 ]; then
139139
# The installer is going to want to ask for confirmation by
140140
# reading stdin. This script was piped into `sh` though and
141141
# doesn't have stdin to pass to its children. Instead we're going
@@ -287,7 +287,7 @@ get_architecture() {
287287
_ostype=unknown-illumos
288288
;;
289289

290-
MINGW* | MSYS* | CYGWIN*)
290+
MINGW* | MSYS* | CYGWIN* | Windows_NT)
291291
_ostype=pc-windows-gnu
292292
;;
293293

0 commit comments

Comments
 (0)