mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustup: factor out installing packages into a function

Browse Source
This commit is contained in:
Erick Tryzelaar 2014-11-30 20:44:03 -08:00
parent b388dc61a5
commit 8ca8e6fa4d
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/etc/rustup.sh
View File

@ -443,6 +443,18 @@ download_and_extract_package() {
fi
}
# Wrap all the commands needed to install a package.
install_package() {
install_script="$1"
sh "${install_script}" "${CFG_INSTALL_FLAGS}"
if [ $? -ne 0 ]
then
rm -Rf "${CFG_TMP_DIR}"
err "failed to install Rust"
fi
}
rm -Rf "${CFG_TMP_DIR}"
need_ok "failed to remove temporary installation directory"
@ -459,35 +471,10 @@ if [ -z "${CFG_DISABLE_CARGO}" ]; then
"${CARGO_TARBALL_NAME}"
fi
(cd "${CFG_TMP_DIR}" && ${CFG_TAR} xzf "${RUST_TARBALL_NAME}")
if [ $? -ne 0 ]
then
rm -Rf "${CFG_TMP_DIR}"
err "failed to unpack installer"
fi
sh "${RUST_LOCAL_INSTALL_SCRIPT}" "${CFG_INSTALL_FLAGS}"
if [ $? -ne 0 ]
then
rm -Rf "${CFG_TMP_DIR}"
err "failed to install Rust"
fi
install_package "${RUST_LOCAL_INSTALL_SCRIPT}"
if [ -z "${CFG_DISABLE_CARGO}" ]; then
(cd "${CFG_TMP_DIR}" && ${CFG_TAR} xzf "${CARGO_TARBALL_NAME}")
if [ $? -ne 0 ]
then
rm -Rf "${CFG_TMP_DIR}"
err "failed to unpack cargo installer"
fi
sh "${CARGO_LOCAL_INSTALL_SCRIPT}" "${CFG_INSTALL_FLAGS}"
if [ $? -ne 0 ]
then
rm -Rf "${CFG_TMP_DIR}"
err "failed to install Cargo"
fi
install_package "${CARGO_LOCAL_INSTALL_SCRIPT}"
fi
rm -Rf "${CFG_TMP_DIR}"