about summary refs log tree commit diff
diff options
context:
space:
mode:
authorantoyo <antoyo@users.noreply.github.com>2022-04-15 11:06:01 -0400
committerGitHub <noreply@github.com>2022-04-15 11:06:01 -0400
commit4210fd49cbea8ef241138a2fb77612f43e0b87a7 (patch)
tree2df76dcf26750995303f19d51d2ca2679c9db9d9
parentc35f4e841e8e576fbd447415d29c9fd25aff3324 (diff)
parentf92779512dd3c4613a7e6d0c9eb578ba5a0ec91c (diff)
downloadrust-4210fd49cbea8ef241138a2fb77612f43e0b87a7.tar.gz
rust-4210fd49cbea8ef241138a2fb77612f43e0b87a7.zip
Merge pull request #160 from MikaelUrankar/master
Don't assume /bin/bash is available on every system.
-rwxr-xr-xbuild.sh2
-rwxr-xr-xbuild_sysroot/build_sysroot.sh2
-rwxr-xr-xbuild_sysroot/prepare_sysroot_src.sh2
-rwxr-xr-xcargo.sh2
-rwxr-xr-xclean_all.sh3
-rwxr-xr-xprepare.sh3
-rwxr-xr-xprepare_build.sh3
-rwxr-xr-xrustup.sh2
-rwxr-xr-xtest.sh2
9 files changed, 12 insertions, 9 deletions
diff --git a/build.sh b/build.sh
index 44eb240715c..ba0d0d04948 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #set -x
 set -e
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index a965ca971a0..f293192a099 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Requires the CHANNEL env var to be set to `debug` or `release.`
 
diff --git a/build_sysroot/prepare_sysroot_src.sh b/build_sysroot/prepare_sysroot_src.sh
index 071e7ed1f85..56768bbf1d0 100755
--- a/build_sysroot/prepare_sysroot_src.sh
+++ b/build_sysroot/prepare_sysroot_src.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 cd $(dirname "$0")
 
diff --git a/cargo.sh b/cargo.sh
index e95564dccda..16e49b20423 100755
--- a/cargo.sh
+++ b/cargo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ -z $CHANNEL ]; then
 export CHANNEL='debug'
diff --git a/clean_all.sh b/clean_all.sh
index a77d1486fe2..782bd3e5058 100755
--- a/clean_all.sh
+++ b/clean_all.sh
@@ -1,5 +1,6 @@
-#!/bin/bash --verbose
+#!/usr/bin/env bash
 set -e
+set -v
 
 rm -rf target/ build_sysroot/{sysroot/,sysroot_src/,target/,Cargo.lock} perf.data{,.old}
 rm -rf regex/ simple-raytracer/
diff --git a/prepare.sh b/prepare.sh
index d39f43f5e1b..e98f24c6e12 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -1,5 +1,6 @@
-#!/bin/bash --verbose
+#!/usr/bin/env bash
 set -e
+set -v
 
 source prepare_build.sh
 
diff --git a/prepare_build.sh b/prepare_build.sh
index 3896775a0b9..8194360da4b 100755
--- a/prepare_build.sh
+++ b/prepare_build.sh
@@ -1,4 +1,5 @@
-#!/bin/bash --verbose
+#!/usr/bin/env bash
 set -e
+set -v
 
 ./build_sysroot/prepare_sysroot_src.sh
diff --git a/rustup.sh b/rustup.sh
index 01ce5bb78be..7edb5558604 100755
--- a/rustup.sh
+++ b/rustup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/test.sh b/test.sh
index 5a8e4f9c0ad..897649e7adb 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # TODO(antoyo): rewrite to cargo-make (or just) or something like that to only rebuild the sysroot when needed?