Repository: spark Updated Branches: refs/heads/branch-1.2 ca3fe8c12 -> 7917f27a3
[SPARK-4312] bash doesn't have "die" sbt-launch-lib.bash includes `die` command but it's not valid command for Linux, MacOS X or Windows. Closes #2898 Author: Jey Kottalam <[email protected]> Closes #3182 from sarutak/SPARK-4312 and squashes the following commits: 24c6677 [Jey Kottalam] bash doesn't have "die" (cherry picked from commit c5db8e2c07e442654f3d368608108e714e080184) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7917f27a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7917f27a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7917f27a Branch: refs/heads/branch-1.2 Commit: 7917f27a3944e1abb9c85e17dba14adc35ef1ff9 Parents: ca3fe8c Author: Jey Kottalam <[email protected]> Authored: Mon Nov 10 12:37:56 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Mon Nov 10 12:38:46 2014 -0800 ---------------------------------------------------------------------- sbt/sbt-launch-lib.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7917f27a/sbt/sbt-launch-lib.bash ---------------------------------------------------------------------- diff --git a/sbt/sbt-launch-lib.bash b/sbt/sbt-launch-lib.bash index 7f05d2e..055e206 100755 --- a/sbt/sbt-launch-lib.bash +++ b/sbt/sbt-launch-lib.bash @@ -124,7 +124,8 @@ require_arg () { local opt="$2" local arg="$3" if [[ -z "$arg" ]] || [[ "${arg:0:1}" == "-" ]]; then - die "$opt requires <$type> argument" + echo "$opt requires <$type> argument" 1>&2 + exit 1 fi } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
