Improve shell scripts
This commit is contained in:
@@ -7,8 +7,8 @@ if env | grep -q '^TRAVIS=true$'; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $travis -eq 0 ]; then
|
if [ $travis -eq 0 ]; then
|
||||||
YUM=`which yum`
|
YUM=`which yum 2>/dev/null`
|
||||||
APT=`which apt-get`
|
APT=`which apt-get 2>/dev/null`
|
||||||
if [ -z "$YUM" -a -z "$APT" ]; then
|
if [ -z "$YUM" -a -z "$APT" ]; then
|
||||||
echo "The package managers can't be found."
|
echo "The package managers can't be found."
|
||||||
exit 1
|
exit 1
|
||||||
@@ -34,5 +34,6 @@ cd -
|
|||||||
rm -rf etcd # clean up to avoid failing on upstream gofmt errors
|
rm -rf etcd # clean up to avoid failing on upstream gofmt errors
|
||||||
|
|
||||||
go get ./... # get all the go dependencies
|
go get ./... # get all the go dependencies
|
||||||
go get golang.org/x/tools/cmd/vet # add in `go vet` for travis
|
[ -e "$GOBIN/mgmt" ] && rm -f "$GOBIN/mgmt" # the `go get` version has no -X
|
||||||
|
go get golang.org/x/tools/cmd/vet # add in `go vet` for travis
|
||||||
go get golang.org/x/tools/cmd/stringer # for automatic stringer-ing
|
go get golang.org/x/tools/cmd/stringer # for automatic stringer-ing
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
- :name: etcd
|
- :name: etcd
|
||||||
:shell:
|
:shell:
|
||||||
- iptables -F
|
- iptables -F
|
||||||
|
- cd /vagrant/mgmt/ && make path
|
||||||
- cd /vagrant/mgmt/ && make deps && make build && cp mgmt ~/bin/
|
- cd /vagrant/mgmt/ && make deps && make build && cp mgmt ~/bin/
|
||||||
- etcd -bind-addr "`hostname --ip-address`:2379" &
|
- etcd -bind-addr "`hostname --ip-address`:2379" &
|
||||||
- cd && mgmt --help
|
- cd && mgmt --help
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ fi
|
|||||||
|
|
||||||
ROOT=$(dirname "${BASH_SOURCE}")/..
|
ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||||
|
|
||||||
RUBY=`which ruby`
|
RUBY=`which ruby 2>/dev/null`
|
||||||
if [ -z $RUBY ]; then
|
if [ -z $RUBY ]; then
|
||||||
echo "The 'ruby' utility can't be found."
|
echo "The 'ruby' utility can't be found."
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
Reference in New Issue
Block a user