diff options
| author | WangTao <barneystinson@aliyun.com> | 2014-08-26 17:30:59 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-08-26 17:30:59 -0700 |
| commit | 2ffd3290fe30c23df8da1efe153b84c23eb2e1cd (patch) | |
| tree | 9017180ac168bc459576b8dd172f076e45359e92 /bin | |
| parent | f1e71d4c3ba678fc108effb05cf2d6101dadc0ce (diff) | |
| download | spark-2ffd3290fe30c23df8da1efe153b84c23eb2e1cd.tar.gz spark-2ffd3290fe30c23df8da1efe153b84c23eb2e1cd.tar.bz2 spark-2ffd3290fe30c23df8da1efe153b84c23eb2e1cd.zip | |
[SPARK-3225]Typo in script
use_conf_dir => user_conf_dir in load-spark-env.sh.
Author: WangTao <barneystinson@aliyun.com>
Closes #1926 from WangTaoTheTonic/TypoInScript and squashes the following commits:
0c104ad [WangTao] Typo in script
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/load-spark-env.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/load-spark-env.sh b/bin/load-spark-env.sh index d425f9feaa..493d3785a0 100644 --- a/bin/load-spark-env.sh +++ b/bin/load-spark-env.sh @@ -27,12 +27,12 @@ if [ -z "$SPARK_ENV_LOADED" ]; then # Returns the parent of the directory this script lives in. parent_dir="$(cd `dirname $0`/..; pwd)" - use_conf_dir=${SPARK_CONF_DIR:-"$parent_dir/conf"} + user_conf_dir=${SPARK_CONF_DIR:-"$parent_dir/conf"} - if [ -f "${use_conf_dir}/spark-env.sh" ]; then + if [ -f "${user_conf_dir}/spark-env.sh" ]; then # Promote all variable declarations to environment (exported) variables set -a - . "${use_conf_dir}/spark-env.sh" + . "${user_conf_dir}/spark-env.sh" set +a fi fi |