Skip to content

Commit 3a32a65

Browse files
committed
---
yaml --- r: 106712 b: refs/heads/try c: 1f7de38 h: refs/heads/master v: v3
1 parent 3ad90d4 commit 3a32a65

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
@@ -2,7 +2,7 @@
22
refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
5-
refs/heads/try: 364d4ad1e55b74522c7ddf1244ec39b23d6f5a60
5+
refs/heads/try: 1f7de380ce85aed2917c5bf801c68170403559e8
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/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)