Skip to content

Commit 8423e86

Browse files
committed
---
yaml --- r: 106713 b: refs/heads/try c: 9523809 h: refs/heads/master i: 106711: 3ad90d4 v: v3
1 parent 3a32a65 commit 8423e86

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
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: 1f7de380ce85aed2917c5bf801c68170403559e8
5+
refs/heads/try: 952380904b8e925851d96b55a959232ef360aede
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: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -240,38 +240,38 @@ need_ok "can't run these binaries on this platform"
240240
# FIXME: Hardcoded 'rustlib' ignores CFG_RUSTLIBDIR
241241
if [ -f "${CFG_PREFIX}/lib/rustlib/manifest" ]
242242
then
243-
while read p; do
244-
msg "uninstall ${CFG_PREFIX}/$p"
245-
rm "${CFG_PREFIX}/$p"
246-
need_ok "failed to remove file"
247-
done < "${CFG_PREFIX}/lib/rustlib/manifest"
243+
while read p; do
244+
msg "uninstall ${CFG_PREFIX}/$p"
245+
rm "${CFG_PREFIX}/$p"
246+
need_ok "failed to remove file"
247+
done < "${CFG_PREFIX}/lib/rustlib/manifest"
248248

249249
# Remove 'rustlib' directory
250-
msg "uninstall ${CFG_PREFIX}/lib/rustlib"
251-
rm -r "${CFG_PREFIX}/lib/rustlib"
252-
need_ok "failed to remove rustlib"
250+
msg "uninstall ${CFG_PREFIX}/lib/rustlib"
251+
rm -r "${CFG_PREFIX}/lib/rustlib"
252+
need_ok "failed to remove rustlib"
253253
fi
254254

255255
# If we're only uninstalling then exit
256256
if [ -n "${CFG_UNINSTALL}" ]
257257
then
258-
exit 0
258+
exit 0
259259
fi
260260

261261
# Iterate through the new manifest and install files
262262
while read p; do
263263

264-
umask 022 && mkdir -p "${CFG_PREFIX}/$(dirname $p)"
265-
need_ok "directory creation failed"
266-
267-
msg "${CFG_PREFIX}/$p"
268-
if echo "$p" | grep "/bin/" > /dev/null
269-
then
270-
install -m755 "${CFG_SRC_DIR}/$p" "${CFG_PREFIX}/$p"
271-
else
272-
install -m644 "${CFG_SRC_DIR}/$p" "${CFG_PREFIX}/$p"
273-
fi
274-
need_ok "file creation failed"
264+
umask 022 && mkdir -p "${CFG_PREFIX}/$(dirname $p)"
265+
need_ok "directory creation failed"
266+
267+
msg "${CFG_PREFIX}/$p"
268+
if echo "$p" | grep "/bin/" > /dev/null
269+
then
270+
install -m755 "${CFG_SRC_DIR}/$p" "${CFG_PREFIX}/$p"
271+
else
272+
install -m644 "${CFG_SRC_DIR}/$p" "${CFG_PREFIX}/$p"
273+
fi
274+
need_ok "file creation failed"
275275

276276
# The manifest lists all files to install
277277
done < "${CFG_SRC_DIR}/lib/rustlib/manifest"

0 commit comments

Comments
 (0)