Merge pull request #3159 from sofuture/master

use /usr/bin/env to find bash
release-2.2
Xiang Li 2015-08-09 10:56:12 -07:00
commit 89bf5824c2
5 changed files with 9 additions and 6 deletions

3
cover
View File

@ -1,8 +1,9 @@
#!/bin/bash -e #!/usr/bin/env bash
# #
# Generate coverage HTML for a package # Generate coverage HTML for a package
# e.g. PKG=./unit ./cover # e.g. PKG=./unit ./cover
# #
set -e
if [ -z "$PKG" ]; then if [ -z "$PKG" ]; then
echo "cover only works with a single package, sorry" echo "cover only works with a single package, sorry"

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
# A non-installed actool can be used, for example: # A non-installed actool can be used, for example:
# ACTOOL=../../appc/spec/bin/actool # ACTOOL=../../appc/spec/bin/actool

View File

@ -1,4 +1,4 @@
#!/usr/bin/bash #!/usr/bin/env bash
tar cv --files-from /dev/null | docker import - scratch tar cv --files-from /dev/null | docker import - scratch
cat <<DF > Dockerfile cat <<DF > Dockerfile

View File

@ -1,8 +1,9 @@
#!/bin/bash -e #!/usr/bin/env bash
# #
# Generate all etcd protobuf bindings. # Generate all etcd protobuf bindings.
# Run from repository root. # Run from repository root.
# #
set -e
PREFIX="github.com/coreos/etcd/Godeps/_workspace/src" PREFIX="github.com/coreos/etcd/Godeps/_workspace/src"
DIRS="./wal/walpb ./etcdserver/etcdserverpb ./snap/snappb ./raft/raftpb ./storage/storagepb" DIRS="./wal/walpb ./etcdserver/etcdserverpb ./snap/snappb ./raft/raftpb ./storage/storagepb"

3
test
View File

@ -1,4 +1,4 @@
#!/bin/bash -e #!/usr/bin/env bash
# #
# Run all etcd tests # Run all etcd tests
# ./test # ./test
@ -8,6 +8,7 @@
# #
# PKG=./wal ./test # PKG=./wal ./test
# PKG=snap ./test # PKG=snap ./test
set -e
# Invoke ./cover for HTML output # Invoke ./cover for HTML output
COVER=${COVER:-"-cover"} COVER=${COVER:-"-cover"}