resolve semantic conflicts

[rust.git] / miri

diff --git a/miri b/miri
index aef61b6dd68d3096ea037ae4968f6433020566a7..337b2a496de878ff7c86f183f98542a082869797 100755 (executable)
--- a/miri
+++ b/miri
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 USAGE=$(cat <<"EOF"
   COMMANDS
@@ -40,7 +40,7 @@ TARGET=$(rustc --version --verbose | grep "^host:" | cut -d ' ' -f 2)
 SYSROOT=$(rustc --print sysroot)
 LIBDIR=$SYSROOT/lib/rustlib/$TARGET/lib
 MIRIDIR=$(dirname "$0")
-if readlink -e . >/dev/null; then
+if readlink -e . &>/dev/null; then
     # This platform supports `readlink -e`.
     MIRIDIR=$(readlink -e "$MIRIDIR")
 fi