Repository: bigtop Updated Branches: refs/heads/master b62020897 -> 6b386d238
BIGTOP-2303. Fix the indentation in docker-hadoop.sh Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6b386d23 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6b386d23 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6b386d23 Branch: refs/heads/master Commit: 6b386d2383676735eba1c2059b8069da42092e03 Parents: b620208 Author: Faraaz Sareshwala <[email protected]> Authored: Mon Feb 1 17:38:17 2016 -0800 Committer: Olaf Flebbe <[email protected]> Committed: Tue Feb 2 13:50:05 2016 +0100 ---------------------------------------------------------------------- .../vm/vagrant-puppet-docker/docker-hadoop.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/6b386d23/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh index 4b7a6b9..a5d2286 100755 --- a/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh +++ b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh @@ -33,7 +33,7 @@ create() { vagrant up --no-parallel if [ $? -ne 0 ]; then echo "Docker container(s) startup failed!"; - exit 1; + exit 1; fi nodes=(`vagrant status |grep bigtop |awk '{print $1}'`) hadoop_head_node=(`echo "hostname -f" |vagrant ssh ${nodes[0]} |tail -n 1`) @@ -88,7 +88,7 @@ get-yaml-config() { RUBY_EXE=ruby which ruby > /dev/null 2>&1 if [ $? -ne 0 ]; then - # use vagrant embedded ruby on Windows + # use vagrant embedded ruby on Windows RUBY_EXE=$(dirname $(which vagrant))/../embedded/bin/ruby fi RUBY_SCRIPT="data = YAML::load(STDIN.read); puts data['$1'];" @@ -106,17 +106,17 @@ while [ $# -gt 0 ]; do case "$1" in -c|--create) if [ $# -lt 2 ]; then - echo "Create requires a number" 1>&2 - usage + echo "Create requires a number" 1>&2 + usage fi create $2 shift 2;; -C|--conf) if [ $# -lt 2 ]; then - echo "Alternative config file for vagrantconfig.yaml" 1>&2 - usage + echo "Alternative config file for vagrantconfig.yaml" 1>&2 + usage fi - vagrantyamlconf=$2 + vagrantyamlconf=$2 shift 2;; -p|--provision) provision
