You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/12/04 21:44:16 UTC
[2/2] git commit: Merge remote-tracking branch
'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
bin/config.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cbb42194
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cbb42194
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cbb42194
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: cbb42194b2caf6ae7178e7e7f4097d6035422645
Parents: db1cc47 b693168
Author: Keith Turner <kt...@apache.org>
Authored: Wed Dec 4 15:40:29 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Dec 4 15:40:29 2013 -0500
----------------------------------------------------------------------
bin/config.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cbb42194/bin/config.sh
----------------------------------------------------------------------
diff --cc bin/config.sh
index 3140119,89685fb..dca2e99
--- a/bin/config.sh
+++ b/bin/config.sh
@@@ -25,12 -25,9 +25,9 @@@
# ACCUMULO_HOME Home directory for Accumulo
# ACCUMULO_LOG_DIR Directory for Accumulo daemon logs
# ACCUMULO_VERSION Accumulo version name
-# HADOOP_HOME Home dir for hadoop.
+# HADOOP_PREFIX Prefix to the home dir for hadoop.
# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
#
- # Values always set by script.
- # MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847)
- #
# Iff ACCUMULO_VERIFY_ONLY is not set, this script will
# * Check for standalone mode (lack of masters and slaves files)
# - Do appropriate set up
@@@ -39,22 -36,26 +36,23 @@@
#
# Values always set by script.
# SSH Default ssh parameters used to start daemons
+ # MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847)
+# HADOOP_HOME Home dir for hadoop. TODO fix this.
if [ -z "${ACCUMULO_HOME}" ] ; then
- this="$0"
- while [ -h "$this" ]; do
- ls=`ls -ld "$this"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- this="$link"
- else
- this=`dirname "$this"`/"$link"
- fi
+ # Start: Resolve Script Directory
+ SOURCE="${BASH_SOURCE[0]}"
+ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ $SOURCE != /* ]] && SOURCE="$bin/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
- bin=`dirname "$this"`
- script=`basename "$this"`
- bin=`cd "$bin"; pwd`
- this="$bin/$script"
+ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ script=$( basename "$SOURCE" )
+ # Stop: Resolve Script Directory
- ACCUMULO_HOME=`dirname "$this"`/..
- export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
+ ACCUMULO_HOME=$( cd -P ${bin}/.. && pwd )
+ export ACCUMULO_HOME
fi
ACCUMULO_CONF_DIR="${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}"