Skip to content

Commit 8f827d3

Browse files
committed
Fall back to hard coded download directory
If mktemp fails, fall back to a hard coded directory, per @nodakai's feedback.
1 parent cb50153 commit 8f827d3

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/etc/rustup.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,18 @@ validate_opt () {
229229
done
230230
}
231231

232+
create_tmp_dir() {
233+
local TMP_DIR=./rustup-tmp-install
234+
235+
rm -Rf "${TMP_DIR}"
236+
need_ok "failed to remove temporary installation directory"
237+
238+
mkdir -p "${TMP_DIR}"
239+
need_ok "failed to create create temporary installation directory"
240+
241+
echo $TMP_DIR
242+
}
243+
232244
probe_need CFG_CURL curl
233245

234246
CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
@@ -392,7 +404,7 @@ PACKAGE_NAME=rust-nightly
392404
PACKAGE_NAME_AND_TRIPLE="${PACKAGE_NAME}-${HOST_TRIPLE}"
393405
TARBALL_NAME="${PACKAGE_NAME_AND_TRIPLE}.tar.gz"
394406
REMOTE_TARBALL="https://static.rust-lang.org/dist/${TARBALL_NAME}"
395-
TMP_DIR=`mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir'`
407+
TMP_DIR=`mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir' 2>/dev/null` || TMP_DIR=$(create_tmp_dir)
396408
LOCAL_TARBALL="${TMP_DIR}/${TARBALL_NAME}"
397409
LOCAL_INSTALL_DIR="${TMP_DIR}/${PACKAGE_NAME_AND_TRIPLE}"
398410
LOCAL_INSTALL_SCRIPT="${LOCAL_INSTALL_DIR}/install.sh"

0 commit comments

Comments
 (0)