OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustup: factor out downloading and extracting the snapshot tarballs

Browse Source
This commit is contained in:
Erick Tryzelaar 2014-12-03 15:17:32 -08:00
parent 4f65d97bf8
commit b388dc61a5
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/etc/rustup.sh
View File

@ -402,44 +402,61 @@ fi
CFG_TMP_DIR="./rustup-tmp-install" CFG_TMP_DIR="./rustup-tmp-install"
RUST_URL="https://static.rust-lang.org/dist"
RUST_PACKAGE_NAME=rust-nightly RUST_PACKAGE_NAME=rust-nightly
RUST_PACKAGE_NAME_AND_TRIPLE="${RUST_PACKAGE_NAME}-${HOST_TRIPLE}" RUST_PACKAGE_NAME_AND_TRIPLE="${RUST_PACKAGE_NAME}-${HOST_TRIPLE}"
RUST_TARBALL_NAME="${RUST_PACKAGE_NAME_AND_TRIPLE}.tar.gz" RUST_TARBALL_NAME="${RUST_PACKAGE_NAME_AND_TRIPLE}.tar.gz"
RUST_REMOTE_TARBALL="https://static.rust-lang.org/dist/${RUST_TARBALL_NAME}"
RUST_LOCAL_TARBALL="${CFG_TMP_DIR}/${RUST_TARBALL_NAME}"
RUST_LOCAL_INSTALL_DIR="${CFG_TMP_DIR}/${RUST_PACKAGE_NAME_AND_TRIPLE}" RUST_LOCAL_INSTALL_DIR="${CFG_TMP_DIR}/${RUST_PACKAGE_NAME_AND_TRIPLE}"
RUST_LOCAL_INSTALL_SCRIPT="${RUST_LOCAL_INSTALL_DIR}/install.sh" RUST_LOCAL_INSTALL_SCRIPT="${RUST_LOCAL_INSTALL_DIR}/install.sh"
CARGO_URL="https://static.rust-lang.org/cargo-dist"
CARGO_PACKAGE_NAME=cargo-nightly CARGO_PACKAGE_NAME=cargo-nightly
CARGO_PACKAGE_NAME_AND_TRIPLE="${CARGO_PACKAGE_NAME}-${HOST_TRIPLE}" CARGO_PACKAGE_NAME_AND_TRIPLE="${CARGO_PACKAGE_NAME}-${HOST_TRIPLE}"
CARGO_TARBALL_NAME="${CARGO_PACKAGE_NAME_AND_TRIPLE}.tar.gz" CARGO_TARBALL_NAME="${CARGO_PACKAGE_NAME_AND_TRIPLE}.tar.gz"
CARGO_REMOTE_TARBALL="https://static.rust-lang.org/cargo-dist/${CARGO_TARBALL_NAME}"
CARGO_LOCAL_TARBALL="${CFG_TMP_DIR}/${CARGO_TARBALL_NAME}"
CARGO_LOCAL_INSTALL_DIR="${CFG_TMP_DIR}/${CARGO_PACKAGE_NAME_AND_TRIPLE}" CARGO_LOCAL_INSTALL_DIR="${CFG_TMP_DIR}/${CARGO_PACKAGE_NAME_AND_TRIPLE}"
CARGO_LOCAL_INSTALL_SCRIPT="${CARGO_LOCAL_INSTALL_DIR}/install.sh" CARGO_LOCAL_INSTALL_SCRIPT="${CARGO_LOCAL_INSTALL_DIR}/install.sh"
# Fetch the package and extract it.
download_and_extract_package() {
remote_url="$1"
tarball_name="$2"
remote_tarball="${remote_url}/${tarball_name}"
local_tarball="${CFG_TMP_DIR}/${tarball_name}"
msg "Downloading ${remote_tarball} to ${local_tarball}"
mkdir -p "${CFG_TMP_DIR}"
need_ok "failed to create create download directory"
"${CFG_CURL}" -f -o "${local_tarball}" "${remote_tarball}"
if [ $? -ne 0 ]
then
rm -Rf "${CFG_TMP_DIR}"
err "failed to download installer"
fi
msg "Extracting ${tarball_name}"
(cd "${CFG_TMP_DIR}" && "${CFG_TAR}" -xvf "${tarball_name}")
if [ $? -ne 0 ]; then
rm -Rf "${CFG_TMP_DIR}"
err "failed to unpack installer"
fi
}
rm -Rf "${CFG_TMP_DIR}" rm -Rf "${CFG_TMP_DIR}"
need_ok "failed to remove temporary installation directory" need_ok "failed to remove temporary installation directory"
mkdir -p "${CFG_TMP_DIR}" mkdir -p "${CFG_TMP_DIR}"
need_ok "failed to create create temporary installation directory" need_ok "failed to create create temporary installation directory"
msg "downloading rust installer" download_and_extract_package \
"${CFG_CURL}" "${RUST_REMOTE_TARBALL}" > "${RUST_LOCAL_TARBALL}" "${RUST_URL}" \
if [ $? -ne 0 ] "${RUST_TARBALL_NAME}"
then
rm -Rf "${CFG_TMP_DIR}"
err "failed to download installer"
fi
if [ -z "${CFG_DISABLE_CARGO}" ]; then if [ -z "${CFG_DISABLE_CARGO}" ]; then
msg "downloading cargo installer" download_and_extract_package \
"${CFG_CURL}" "${CARGO_REMOTE_TARBALL}" > "${CARGO_LOCAL_TARBALL}" "${CARGO_URL}" \
if [ $? -ne 0 ] "${CARGO_TARBALL_NAME}"
then
rm -Rf "${CFG_TMP_DIR}"
err "failed to download cargo installer"
fi
fi fi