Repository: spark
Updated Branches:
refs/heads/master 7aacb7bfa -> 30ea2868e
[SPARK-4076] Parameter expansion in spark-config is wrong
In sbin/spark-config.sh, parameter expansion is used to extract source root as
follows.
this="${BASH_SOURCE-$0}"
I think, the parameter expansion should be ":" instead of "".
If we use "-" and BASH_SOURCE="", (empty character is set, not unset),
"" (empty character) is set to $this.
Author: Kousuke Saruta <[email protected]>
Closes #2930 from sarutak/SPARK-4076 and squashes the following commits:
32a0370 [Kousuke Saruta] Fixed wrong parameter expansion
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/30ea2868
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/30ea2868
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/30ea2868
Branch: refs/heads/master
Commit: 30ea2868e7afbec20bfc83818249b6d2d7dc6aec
Parents: 7aacb7b
Author: Kousuke Saruta <[email protected]>
Authored: Fri Oct 24 13:04:35 2014 -0700
Committer: Andrew Or <[email protected]>
Committed: Fri Oct 24 13:04:35 2014 -0700
----------------------------------------------------------------------
sbin/spark-config.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/30ea2868/sbin/spark-config.sh
----------------------------------------------------------------------
diff --git a/sbin/spark-config.sh b/sbin/spark-config.sh
index 1d154e6..b0361d7 100755
--- a/sbin/spark-config.sh
+++ b/sbin/spark-config.sh
@@ -20,7 +20,7 @@
# also should not be passed any arguments, since we need original $*
# resolve links - $0 may be a softlink
-this="${BASH_SOURCE-$0}"
+this="${BASH_SOURCE:-$0}"
common_bin="$(cd -P -- "$(dirname -- "$this")" && pwd -P)"
script="$(basename -- "$this")"
this="$common_bin/$script"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
