You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by ar...@apache.org on 2015/06/18 11:57:48 UTC
incubator-lens git commit: LENS-617:lens-config.sh is ignoring
${LENSCPPATH}
Repository: incubator-lens
Updated Branches:
refs/heads/master ead42f8e1 -> 1fde486a5
LENS-617:lens-config.sh is ignoring ${LENSCPPATH}
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/1fde486a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/1fde486a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/1fde486a
Branch: refs/heads/master
Commit: 1fde486a57e4fa0a85fe7a32a07e711a4a60b0bc
Parents: ead42f8
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Thu Jun 18 15:14:06 2015 +0530
Committer: arshad-matin <ar...@apache.org>
Committed: Thu Jun 18 15:14:06 2015 +0530
----------------------------------------------------------------------
tools/scripts/lens-config.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1fde486a/tools/scripts/lens-config.sh
----------------------------------------------------------------------
diff --git a/tools/scripts/lens-config.sh b/tools/scripts/lens-config.sh
index 4470132..b901fbb 100644
--- a/tools/scripts/lens-config.sh
+++ b/tools/scripts/lens-config.sh
@@ -85,9 +85,9 @@ case $type in
fi
LENS_OPTS="$LENS_OPTS $LENS_CLIENT_OPTS $LENS_CLIENT_HEAP"
LENS_LOG_DIR="${LENS_LOG_DIR:-$BASEDIR/logs}"
- export LENS_LOG_DIR
+ export LENS_LOG_DIR
LENS_HOME_DIR="${LENS_HOME_DIR:-$BASEDIR}"
- export LENS_HOME_DIR
+ export LENS_HOME_DIR
;;
server)
if test -z "$LENS_SERVER_HEAP"
@@ -95,7 +95,7 @@ case $type in
LENS_SERVER_HEAP=$DEFAULT_JAVA_HEAP_MAX
fi
LENS_OPTS="$LENS_OPTS $LENS_SERVER_OPTS $LENS_SERVER_HEAP"
- LENSCPPATH="$LENS_CONF"
+ LENSCPPATH="${LENS_CONF}:${LENSCPPATH}"
LENS_EXPANDED_WEBAPP_DIR=${LENS_EXPANDED_WEBAPP_DIR:-${BASEDIR}/webapp}
export LENS_EXPANDED_WEBAPP_DIR
# set the server classpath
@@ -111,7 +111,7 @@ case $type in
HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${LENSCPPATH}
export HADOOP_CLASSPATH
-
+
# log and pid dirs for applications
LENS_LOG_DIR="${LENS_LOG_DIR:-$BASEDIR/logs}"
export LENS_LOG_DIR