Skip to content

Commit 79433e4

Browse files
committed
---
yaml --- r: 108933 b: refs/heads/dist-snap c: 1f7de38 h: refs/heads/master i: 108931: b5c9e25 v: v3
1 parent 281c6da commit 79433e4

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 364d4ad1e55b74522c7ddf1244ec39b23d6f5a60
9+
refs/heads/dist-snap: 1f7de380ce85aed2917c5bf801c68170403559e8
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/etc/install.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,19 @@ fi
223223
step_msg "validating $CFG_SELF args"
224224
validate_opt
225225

226+
# Sanity check: can we can write to the destination?
227+
touch "${CFG_PREFIX}/lib/rust-install-probe" 2> /dev/null
228+
if [ $? -ne 0 ]
229+
then
230+
err "can't write to destination. try again with 'sudo'."
231+
fi
232+
rm -r "${CFG_PREFIX}/lib/rust-install-probe"
233+
need_ok "failed to remove install probe"
234+
235+
# Sanity check: can we run these binaries?
236+
"${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
237+
need_ok "can't run these binaries on this platform"
238+
226239
# First, uninstall from the installation prefix
227240
# FIXME: Hardcoded 'rustlib' ignores CFG_RUSTLIBDIR
228241
if [ -f "${CFG_PREFIX}/lib/rustlib/manifest" ]
@@ -262,3 +275,9 @@ while read p; do
262275

263276
# The manifest lists all files to install
264277
done < "${CFG_SRC_DIR}/lib/rustlib/manifest"
278+
279+
echo
280+
echo " Rust is ready to roll."
281+
echo
282+
283+

0 commit comments

Comments
 (0)