Skip to content

Use mktemp for temporary download directory #19227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 29, 2014
Merged

Use mktemp for temporary download directory #19227

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb50153
Use mktemp for temporary download directory
johshoff Nov 22, 2014
8f827d3
Fall back to hard coded download directory
johshoff Nov 27, 2014
0128159
Merge branch 'master' into cfg_tmp_dir
johshoff Dec 24, 2014
ee72c57
Better temporary directory name
johshoff Dec 24, 2014
0e2b5d9
Split overly long line
johshoff Dec 28, 2014
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
17 changes: 13 additions & 4 deletions src/etc/rustup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,18 @@ validate_opt() {
done
}

create_tmp_dir() {
local TMP_DIR=./rustup-tmp-install

rm -Rf "${TMP_DIR}"
need_ok "failed to remove temporary installation directory"

mkdir -p "${TMP_DIR}"
need_ok "failed to create create temporary installation directory"

echo $TMP_DIR
}

probe_need CFG_CURL curl
probe_need CFG_TAR tar
probe_need CFG_FILE file
Expand Down Expand Up @@ -401,7 +413,7 @@ then
CFG_INSTALL_FLAGS="${CFG_INSTALL_FLAGS} --prefix=${CFG_PREFIX}"
fi

CFG_TMP_DIR="./rustup-tmp-install"
CFG_TMP_DIR=`mktemp -d 2>/dev/null || mktemp -d -t 'rustup-tmp-install' 2>/dev/null` || CFG_TMP_DIR=$(create_tmp_dir)
Copy link
Member

Choose a reason for hiding this comment

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

This line is over 100 characters long, which fails the style checker

Copy link
Contributor

Choose a reason for hiding this comment

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

This probably use $() instead of backticks, but it must certainly be quoted.


RUST_URL="https://static.rust-lang.org/dist"
RUST_PACKAGE_NAME=rust-nightly
Expand All @@ -424,9 +436,6 @@ download_package() {

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
Expand Down