chukwa-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject [1/2] chukwa git commit: CHUKWA-774. Fixed resolution of symlinked prefix directory. (Eric Yang)
Date Thu, 20 Aug 2015 03:08:06 GMT
Repository: chukwa
Updated Branches:
  refs/heads/master 7f662e8c6 -> dd10a5cf7


CHUKWA-774. Fixed resolution of symlinked prefix directory.  (Eric Yang)


Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo
Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/14e82334
Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/14e82334
Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/14e82334

Branch: refs/heads/master
Commit: 14e823343cfac98a34e2502ffa49c3169e2c8a7f
Parents: 7f662e8
Author: Eric Yang <eyang@apache.org>
Authored: Thu Aug 13 21:24:10 2015 -0700
Committer: Eric Yang <eyang@apache.org>
Committed: Thu Aug 13 21:24:10 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt          | 4 +++-
 bin/chukwa-config.sh | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/chukwa/blob/14e82334/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f4e7204..a8a17e8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -52,7 +52,9 @@ Trunk (unreleased changes)
 
   BUGS
 
-    CHUKWA-771.  Improved code quality issue identified by findbugs.  (Eric Yang)
+    CHUKWA-774. Fixed resolution of symlinked prefix directory.  (Eric Yang)
+
+    CHUKWA-771. Improved code quality issue identified by findbugs.  (Eric Yang)
 
     CHUKWA-770. Moved default dashboard population code to login.jsp. (Eric Yang)
 

http://git-wip-us.apache.org/repos/asf/chukwa/blob/14e82334/bin/chukwa-config.sh
----------------------------------------------------------------------
diff --git a/bin/chukwa-config.sh b/bin/chukwa-config.sh
index 203541a..b6641da 100755
--- a/bin/chukwa-config.sh
+++ b/bin/chukwa-config.sh
@@ -24,11 +24,12 @@ this="${BASH_SOURCE-$0}"
 
 # convert relative path to absolute path
 CHUKWA_LIBEXEC=$(cd -P -- "$(dirname -- "$this")" && pwd -P)
+CHUKWA_PREFIX=$(dirname ${CHUKWA_LIBEXEC})
 script="$(basename -- "$this")"
 this="$CHUKWA_PREFIX/$script"
 
 # the root of the Chukwa installation
-export CHUKWA_HOME=`pwd -P ${CHUKWA_LIBEXEC}/..`
+export CHUKWA_HOME=$CHUKWA_PREFIX
 
 #check to see if the conf dir is given as an optional argument
 if [ $# -gt 1 ]


Mime
View raw message