Updated Branches: refs/heads/master 473dd4fb3 -> 4a819bd6b
Fixed shell scripts to assume bash. Review: https://reviews.apache.org/r/16164 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4a819bd6 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4a819bd6 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4a819bd6 Branch: refs/heads/master Commit: 4a819bd6b84e2ecdf7a65f43760a3dc04eafa96a Parents: 473dd4f Author: Benjamin Mahler <[email protected]> Authored: Tue Dec 10 13:05:18 2013 -0800 Committer: Benjamin Mahler <[email protected]> Committed: Wed Dec 11 10:35:43 2013 -0800 ---------------------------------------------------------------------- src/deploy/mesos-daemon.sh.in | 2 +- src/deploy/mesos-deploy-env.sh.template | 4 ++-- src/deploy/mesos-start-cluster.sh.in | 2 +- src/deploy/mesos-start-masters.sh.in | 2 +- src/deploy/mesos-start-slaves.sh.in | 2 +- src/deploy/mesos-stop-cluster.sh.in | 2 +- src/deploy/mesos-stop-masters.sh.in | 2 +- src/deploy/mesos-stop-slaves.sh.in | 2 +- src/examples/java/test-exception-framework.in | 2 +- src/examples/java/test-executor.in | 2 +- src/examples/java/test-framework.in | 2 +- src/examples/java/test-multiple-executors-framework.in | 2 +- src/examples/python/test-executor.in | 2 +- src/examples/python/test-framework.in | 2 +- src/scaling/nested_exec | 2 +- src/scaling/scaling_exec | 2 +- src/scaling/scaling_sched | 2 +- src/tests/balloon_framework_test.sh | 2 +- src/tests/java_exception_test.sh | 2 +- src/tests/java_framework_test.sh | 2 +- src/tests/no_executor_framework_test.sh | 2 +- src/tests/python_framework_test.sh | 2 +- src/tests/test_framework_test.sh | 2 +- support/apply-review.sh | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/deploy/mesos-daemon.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-daemon.sh.in b/src/deploy/mesos-daemon.sh.in index 2242ed1..b9866ac 100644 --- a/src/deploy/mesos-daemon.sh.in +++ b/src/deploy/mesos-daemon.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash prefix=@prefix@ exec_prefix=@exec_prefix@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/deploy/mesos-deploy-env.sh.template ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-deploy-env.sh.template b/src/deploy/mesos-deploy-env.sh.template index afc6197..bea5584 100644 --- a/src/deploy/mesos-deploy-env.sh.template +++ b/src/deploy/mesos-deploy-env.sh.template @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This file contains environment variables that modify how the deploy # scripts are run. For example, it can be used to configure SSH @@ -10,4 +10,4 @@ export SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2" # Use sudo for launching masters and slaves. -#export DEPLOY_WITH_SUDO=1 \ No newline at end of file +#export DEPLOY_WITH_SUDO=1 http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/deploy/mesos-start-cluster.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-start-cluster.sh.in b/src/deploy/mesos-start-cluster.sh.in index fa27de0..1221afa 100644 --- a/src/deploy/mesos-start-cluster.sh.in +++ b/src/deploy/mesos-start-cluster.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash prefix=@prefix@ exec_prefix=@exec_prefix@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/deploy/mesos-start-masters.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-start-masters.sh.in b/src/deploy/mesos-start-masters.sh.in index 3f0f524..36641ec 100644 --- a/src/deploy/mesos-start-masters.sh.in +++ b/src/deploy/mesos-start-masters.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash prefix=@prefix@ exec_prefix=@exec_prefix@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/deploy/mesos-start-slaves.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-start-slaves.sh.in b/src/deploy/mesos-start-slaves.sh.in index 7283e88..8661c8d 100644 --- a/src/deploy/mesos-start-slaves.sh.in +++ b/src/deploy/mesos-start-slaves.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash prefix=@prefix@ exec_prefix=@exec_prefix@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/deploy/mesos-stop-cluster.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-stop-cluster.sh.in b/src/deploy/mesos-stop-cluster.sh.in index 1d38944..6f71050 100644 --- a/src/deploy/mesos-stop-cluster.sh.in +++ b/src/deploy/mesos-stop-cluster.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash prefix=@prefix@ exec_prefix=@exec_prefix@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/deploy/mesos-stop-masters.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-stop-masters.sh.in b/src/deploy/mesos-stop-masters.sh.in index 993bc64..c85c977 100644 --- a/src/deploy/mesos-stop-masters.sh.in +++ b/src/deploy/mesos-stop-masters.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash prefix=@prefix@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/deploy/mesos-stop-slaves.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-stop-slaves.sh.in b/src/deploy/mesos-stop-slaves.sh.in index dd0c2b8..ea5b26a 100644 --- a/src/deploy/mesos-stop-slaves.sh.in +++ b/src/deploy/mesos-stop-slaves.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash prefix=@prefix@ DEPLOY_DIR=@localstatedir@/@PACKAGE@/deploy http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/examples/java/test-exception-framework.in ---------------------------------------------------------------------- diff --git a/src/examples/java/test-exception-framework.in b/src/examples/java/test-exception-framework.in index 6aefc6d..1d36e06 100644 --- a/src/examples/java/test-exception-framework.in +++ b/src/examples/java/test-exception-framework.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This script uses MESOS_SOURCE_DIR and MESOS_BUILD_DIR which come # from configuration substitutions. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/examples/java/test-executor.in ---------------------------------------------------------------------- diff --git a/src/examples/java/test-executor.in b/src/examples/java/test-executor.in index 27fbb64..896ff1d 100644 --- a/src/examples/java/test-executor.in +++ b/src/examples/java/test-executor.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This script uses MESOS_SOURCE_DIR and MESOS_BUILD_DIR which come # from configuration substitutions. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/examples/java/test-framework.in ---------------------------------------------------------------------- diff --git a/src/examples/java/test-framework.in b/src/examples/java/test-framework.in index 251a758..b095f61 100644 --- a/src/examples/java/test-framework.in +++ b/src/examples/java/test-framework.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This script uses MESOS_SOURCE_DIR and MESOS_BUILD_DIR which come # from configuration substitutions. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/examples/java/test-multiple-executors-framework.in ---------------------------------------------------------------------- diff --git a/src/examples/java/test-multiple-executors-framework.in b/src/examples/java/test-multiple-executors-framework.in index 42839cc..c4915fc 100644 --- a/src/examples/java/test-multiple-executors-framework.in +++ b/src/examples/java/test-multiple-executors-framework.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This script uses MESOS_SOURCE_DIR and MESOS_BUILD_DIR which come # from configuration substitutions. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/examples/python/test-executor.in ---------------------------------------------------------------------- diff --git a/src/examples/python/test-executor.in b/src/examples/python/test-executor.in index e1179ba..773349b 100644 --- a/src/examples/python/test-executor.in +++ b/src/examples/python/test-executor.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This script uses MESOS_SOURCE_DIR and MESOS_BUILD_DIR which come # from configuration substitutions. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/examples/python/test-framework.in ---------------------------------------------------------------------- diff --git a/src/examples/python/test-framework.in b/src/examples/python/test-framework.in index 6c78531..68b1387 100644 --- a/src/examples/python/test-framework.in +++ b/src/examples/python/test-framework.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This script uses MESOS_SOURCE_DIR and MESOS_BUILD_DIR which come # from configuration substitutions. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/scaling/nested_exec ---------------------------------------------------------------------- diff --git a/src/scaling/nested_exec b/src/scaling/nested_exec index be0dba2..45ba126 100755 --- a/src/scaling/nested_exec +++ b/src/scaling/nested_exec @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export PYTHONPATH="$PYTHONPATH:../swig/python" cd `dirname $0` exec ./nested_exec.py $@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/scaling/scaling_exec ---------------------------------------------------------------------- diff --git a/src/scaling/scaling_exec b/src/scaling/scaling_exec index 2f57084..3be8bc8 100755 --- a/src/scaling/scaling_exec +++ b/src/scaling/scaling_exec @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export PYTHONPATH="$PYTHONPATH:../swig/python" cd `dirname $0` exec ./scaling_exec.py $@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/scaling/scaling_sched ---------------------------------------------------------------------- diff --git a/src/scaling/scaling_sched b/src/scaling/scaling_sched index c7a27bc..5c6c247 100755 --- a/src/scaling/scaling_sched +++ b/src/scaling/scaling_sched @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export PYTHONPATH="$PYTHONPATH:../swig/python" cd `dirname $0` exec ./scaling_sched.py $@ http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/tests/balloon_framework_test.sh ---------------------------------------------------------------------- diff --git a/src/tests/balloon_framework_test.sh b/src/tests/balloon_framework_test.sh index 4552c84..bf92cd8 100755 --- a/src/tests/balloon_framework_test.sh +++ b/src/tests/balloon_framework_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script runs the balloon framework on a cluster using the cgroups # isolator and checks that the framework returns a status of 1. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/tests/java_exception_test.sh ---------------------------------------------------------------------- diff --git a/src/tests/java_exception_test.sh b/src/tests/java_exception_test.sh index 8290506..fd02322 100755 --- a/src/tests/java_exception_test.sh +++ b/src/tests/java_exception_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Expecting MESOS_SOURCE_DIR and MESOS_BUILD_DIR to be in environment. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/tests/java_framework_test.sh ---------------------------------------------------------------------- diff --git a/src/tests/java_framework_test.sh b/src/tests/java_framework_test.sh index f18a9b4..95a05a6 100755 --- a/src/tests/java_framework_test.sh +++ b/src/tests/java_framework_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Expecting MESOS_SOURCE_DIR and MESOS_BUILD_DIR to be in environment. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/tests/no_executor_framework_test.sh ---------------------------------------------------------------------- diff --git a/src/tests/no_executor_framework_test.sh b/src/tests/no_executor_framework_test.sh index 5eb94e1..e8d72a3 100755 --- a/src/tests/no_executor_framework_test.sh +++ b/src/tests/no_executor_framework_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Expecting MESOS_SOURCE_DIR and MESOS_BUILD_DIR to be in environment. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/tests/python_framework_test.sh ---------------------------------------------------------------------- diff --git a/src/tests/python_framework_test.sh b/src/tests/python_framework_test.sh index f5b755b..a1e36df 100755 --- a/src/tests/python_framework_test.sh +++ b/src/tests/python_framework_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Expecting MESOS_SOURCE_DIR and MESOS_BUILD_DIR to be in environment. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/src/tests/test_framework_test.sh ---------------------------------------------------------------------- diff --git a/src/tests/test_framework_test.sh b/src/tests/test_framework_test.sh index cf521ee..277245d 100755 --- a/src/tests/test_framework_test.sh +++ b/src/tests/test_framework_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Expecting MESOS_SOURCE_DIR and MESOS_BUILD_DIR to be in environment. http://git-wip-us.apache.org/repos/asf/mesos/blob/4a819bd6/support/apply-review.sh ---------------------------------------------------------------------- diff --git a/support/apply-review.sh b/support/apply-review.sh index ae31cb6..7f9a633 100755 --- a/support/apply-review.sh +++ b/support/apply-review.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Provides a tool to "apply" a review from Review Board.
