Skip to content

Commit

Permalink
[SPARK-3225]Typo in script
Browse files Browse the repository at this point in the history
use_conf_dir => user_conf_dir in load-spark-env.sh.

Author: WangTao <barneystinson@aliyun.com>

Closes apache#1926 from WangTaoTheTonic/TypoInScript and squashes the following commits:

0c104ad [WangTao] Typo in script
  • Loading branch information
WangTaoTheTonic authored and mateiz committed Aug 27, 2014
1 parent f1e71d4 commit 2ffd329
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bin/load-spark-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 2ffd329

Please sign in to comment.