Skip to content

Commit

Permalink
Untabify rustup.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
brson committed Oct 27, 2014
1 parent 03ad7e7 commit e59355b
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions src/etc/rustup.sh
Expand Up @@ -368,20 +368,20 @@ HOST_TRIPLE="${CFG_CPUTYPE}-${CFG_OSTYPE}"
# Is this a triple we have nightlies for?
case $HOST_TRIPLE in

x86_64-unknown-linux-gnu)
;;
x86_64-unknown-linux-gnu)
;;

i686-unknown-linux-gnu)
;;
i686-unknown-linux-gnu)
;;

x86_64-apple-darwin)
;;
x86_64-apple-darwin)
;;

i686-apple-darwin)
;;
i686-apple-darwin)
;;

*)
err "rustup.sh doesn't work for host $HOST_TRIPLE"
*)
err "rustup.sh doesn't work for host $HOST_TRIPLE"

esac

Expand Down Expand Up @@ -414,8 +414,8 @@ msg "downloading rust installer"
"${CFG_CURL}" "${REMOTE_TARBALL}" > "${LOCAL_TARBALL}"
if [ $? -ne 0 ]
then
rm -Rf "${TMP_DIR}"
err "failed to download installer"
rm -Rf "${TMP_DIR}"
err "failed to download installer"
fi

if [ -z "${CFG_DISABLE_CARGO}" ]; then
Expand All @@ -432,27 +432,27 @@ fi
(cd "${TMP_DIR}" && tar xzf "${TARBALL_NAME}")
if [ $? -ne 0 ]
then
rm -Rf "${TMP_DIR}"
err "failed to unpack installer"
rm -Rf "${TMP_DIR}"
err "failed to unpack installer"
fi

MAYBE_UNINSTALL=
if [ -n "${CFG_UNINSTALL}" ]
then
MAYBE_UNINSTALL="--uninstall"
MAYBE_UNINSTALL="--uninstall"
fi

MAYBE_PREFIX=
if [ -n "${CFG_PREFIX}" ]
then
MAYBE_PREFIX="--prefix=${CFG_PREFIX}"
MAYBE_PREFIX="--prefix=${CFG_PREFIX}"
fi

sh "${LOCAL_INSTALL_SCRIPT}" "${MAYBE_UNINSTALL}" "${MAYBE_PREFIX}"
if [ $? -ne 0 ]
then
rm -Rf "${TMP_DIR}"
err "failed to install Rust"
rm -Rf "${TMP_DIR}"
err "failed to install Rust"
fi

if [ -z "${CFG_DISABLE_CARGO}" ]; then
Expand Down

4 comments on commit e59355b

@bors
Copy link
Contributor

@bors bors commented on e59355b Oct 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@e59355b

@bors
Copy link
Contributor

@bors bors commented on e59355b Oct 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/rustup = e59355b into auto

@bors
Copy link
Contributor

@bors bors commented on e59355b Oct 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/rustup = e59355b merged ok, testing candidate = 23a17826

@bors
Copy link
Contributor

@bors bors commented on e59355b Oct 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.