diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-17 08:35:23 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-17 11:50:30 -0800 |
| commit | cce3fc043e5c238015fb49645b0536097ae495e3 (patch) | |
| tree | d67bfa67a7ebacbe0882c4e15351202d9a3baf64 /src/etc | |
| parent | 3369b33a20001d7ff1871f39389dfb9ed3fbb829 (diff) | |
| parent | 4ecad89636dc7d15dd593776b342b01c7bdf2f50 (diff) | |
| download | rust-cce3fc043e5c238015fb49645b0536097ae495e3.tar.gz rust-cce3fc043e5c238015fb49645b0536097ae495e3.zip | |
rollup merge of #19905: AaronFriel/patch-1
Was testing rustup on a very minimal Debian installation and got errors during the install process (error occurred in `install.sh` of the Rust nightly.) Noticed that Rustup was downloading the i686 nightly instead of x86-64. Installing `file` fixed the problem, and this patch adds the probe to ensure file is installed before attempting to use it. There may still be an issue with the i686 installation, I did not investigate further.
Diffstat (limited to 'src/etc')
| -rwxr-xr-x | src/etc/rustup.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/rustup.sh b/src/etc/rustup.sh index b610bc65b09..5b8ccf924eb 100755 --- a/src/etc/rustup.sh +++ b/src/etc/rustup.sh @@ -231,6 +231,7 @@ validate_opt() { probe_need CFG_CURL curl probe_need CFG_TAR tar +probe_need CFG_FILE file CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/" CFG_SELF="$0" @@ -359,7 +360,7 @@ esac # Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ] then - file -L "$SHELL" | grep -q "x86[_-]64" + "${CFG_FILE}" -L "$SHELL" | grep -q "x86[_-]64" if [ $? != 0 ]; then CFG_CPUTYPE=i686 fi |