Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Handle $SHELL being set but not an absolute path. #22

Merged
merged 2 commits into from
Jul 6, 2015
Merged

Handle $SHELL being set but not an absolute path. #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68599ae
Handle $SHELL being set but not an absolute path.
sourcefrog Jun 29, 2015
24161b9
Don't look at binaries to determine arch unless they exist
sourcefrog Jun 30, 2015
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
4 changes: 2 additions & 2 deletions rustup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,10 +1014,10 @@ get_architecture() {
# if configure is running in an interactive bash shell. /usr/bin/env
# exists *everywhere*.
local _bin_to_probe="$SHELL"
if [ -z "$_bin_to_probe" -a -e "/usr/bin/env" ]; then
if [ ! -e "$_bin_to_probe" -a -e "/usr/bin/env" ]; then
_bin_to_probe="/usr/bin/env"
fi
if [ -n "$_bin_to_probe" ]; then
if [ -e "$_bin_to_probe" ]; then
file -L "$_bin_to_probe" | grep -q "x86[_-]64"
if [ $? != 0 ]; then
local _cputype=i686
Expand Down