Updated Branches: refs/heads/trunk acf2fd47f -> 755328b9c
Change order of directory searching for c*.in.sh patch by Benjamin Coverston; reviewed by Ben Gamble for CASSANDRA-3983 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/755328b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/755328b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/755328b9 Branch: refs/heads/trunk Commit: 755328b9c550a65c51881f918fc702ec92fb8f5c Parents: acf2fd4 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Feb 22 22:30:26 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Feb 22 22:30:26 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 8 ++++---- bin/cassandra-cli | 8 ++++---- bin/json2sstable | 8 ++++---- bin/nodetool | 7 ++++--- bin/sstable2json | 8 ++++---- bin/sstablekeys | 8 ++++---- bin/sstableloader | 8 ++++---- tools/bin/cassandra-stress | 7 ++++--- 9 files changed, 33 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9516477..b843cfe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ * upgrade thrift to 0.9.0 (CASSANDRA-3719) * drop unnecessary keyspace from user-defined compaction API (CASSANDRA-5139) * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) 1.2.2 http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/bin/cassandra ---------------------------------------------------------------------- diff --git a/bin/cassandra b/bin/cassandra index 5403257..fae5327 100755 --- a/bin/cassandra +++ b/bin/cassandra @@ -67,11 +67,11 @@ # If an include wasn't specified in the environment, then search for one... if [ "x$CASSANDRA_INCLUDE" = "x" ]; then # Locations (in order) to use when searching for an include file. - for include in /usr/share/cassandra/cassandra.in.sh \ - /usr/local/share/cassandra/cassandra.in.sh \ - /opt/cassandra/cassandra.in.sh \ + for include in "`dirname $0`/cassandra.in.sh" \ "$HOME/.cassandra.in.sh" \ - "`dirname $0`/cassandra.in.sh"; do + /usr/share/cassandra/cassandra.in.sh \ + /usr/local/share/cassandra/cassandra.in.sh \ + /opt/cassandra/cassandra.in.sh; do if [ -r "$include" ]; then . "$include" break http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/bin/cassandra-cli ---------------------------------------------------------------------- diff --git a/bin/cassandra-cli b/bin/cassandra-cli index c5fe27b..23d7dbb 100755 --- a/bin/cassandra-cli +++ b/bin/cassandra-cli @@ -17,11 +17,11 @@ # limitations under the License. if [ "x$CASSANDRA_INCLUDE" = "x" ]; then - for include in /usr/share/cassandra/cassandra.in.sh \ + for include in "`dirname $0`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ /usr/local/share/cassandra/cassandra.in.sh \ - /opt/cassandra/cassandra.in.sh \ - ~/.cassandra.in.sh \ - `dirname $0`/cassandra.in.sh; do + /opt/cassandra/cassandra.in.sh; do if [ -r $include ]; then . $include break http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/bin/json2sstable ---------------------------------------------------------------------- diff --git a/bin/json2sstable b/bin/json2sstable index 02ebaaf..29d2e46 100755 --- a/bin/json2sstable +++ b/bin/json2sstable @@ -17,11 +17,11 @@ # limitations under the License. if [ "x$CASSANDRA_INCLUDE" = "x" ]; then - for include in /usr/share/cassandra/cassandra.in.sh \ + for include in "`dirname $0`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ /usr/local/share/cassandra/cassandra.in.sh \ - /opt/cassandra/cassandra.in.sh \ - ~/.cassandra.in.sh \ - `dirname $0`/cassandra.in.sh; do + /opt/cassandra/cassandra.in.sh; do if [ -r $include ]; then . $include break http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/bin/nodetool ---------------------------------------------------------------------- diff --git a/bin/nodetool b/bin/nodetool index 6678942..54201f4 100755 --- a/bin/nodetool +++ b/bin/nodetool @@ -22,10 +22,11 @@ if [ `basename $0` = 'nodeprobe' ]; then fi if [ "x$CASSANDRA_INCLUDE" = "x" ]; then - for include in /usr/share/cassandra/cassandra.in.sh \ + for include in "`dirname $0`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ /usr/local/share/cassandra/cassandra.in.sh \ - /opt/cassandra/cassandra.in.sh \ - `dirname $0`/cassandra.in.sh; do + /opt/cassandra/cassandra.in.sh; do if [ -r $include ]; then . $include break http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/bin/sstable2json ---------------------------------------------------------------------- diff --git a/bin/sstable2json b/bin/sstable2json index dca2bd6..4194f63 100755 --- a/bin/sstable2json +++ b/bin/sstable2json @@ -17,11 +17,11 @@ # limitations under the License. if [ "x$CASSANDRA_INCLUDE" = "x" ]; then - for include in /usr/share/cassandra/cassandra.in.sh \ + for include in "`dirname $0`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ /usr/local/share/cassandra/cassandra.in.sh \ - /opt/cassandra/cassandra.in.sh \ - ~/.cassandra.in.sh \ - `dirname $0`/cassandra.in.sh; do + /opt/cassandra/cassandra.in.sh; do if [ -r $include ]; then . $include break http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/bin/sstablekeys ---------------------------------------------------------------------- diff --git a/bin/sstablekeys b/bin/sstablekeys index 4c87bb5..9829744 100755 --- a/bin/sstablekeys +++ b/bin/sstablekeys @@ -17,11 +17,11 @@ # limitations under the License. if [ "x$CASSANDRA_INCLUDE" = "x" ]; then - for include in /usr/share/cassandra/cassandra.in.sh \ + for include in "`dirname $0`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ /usr/local/share/cassandra/cassandra.in.sh \ - /opt/cassandra/cassandra.in.sh \ - ~/.cassandra.in.sh \ - `dirname $0`/cassandra.in.sh; do + /opt/cassandra/cassandra.in.sh; do if [ -r $include ]; then . $include break http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/bin/sstableloader ---------------------------------------------------------------------- diff --git a/bin/sstableloader b/bin/sstableloader index 2c82aa9..f1a4d63 100755 --- a/bin/sstableloader +++ b/bin/sstableloader @@ -17,11 +17,11 @@ # limitations under the License. if [ "x$CASSANDRA_INCLUDE" = "x" ]; then - for include in /usr/share/cassandra/cassandra.in.sh \ + for include in "`dirname $0`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ /usr/local/share/cassandra/cassandra.in.sh \ - /opt/cassandra/cassandra.in.sh \ - ~/.cassandra.in.sh \ - `dirname $0`/cassandra.in.sh; do + /opt/cassandra/cassandra.in.sh; do if [ -r $include ]; then . $include break http://git-wip-us.apache.org/repos/asf/cassandra/blob/755328b9/tools/bin/cassandra-stress ---------------------------------------------------------------------- diff --git a/tools/bin/cassandra-stress b/tools/bin/cassandra-stress index 9fe2f88..39257cd 100755 --- a/tools/bin/cassandra-stress +++ b/tools/bin/cassandra-stress @@ -17,10 +17,11 @@ # limitations under the License. if [ "x$CASSANDRA_INCLUDE" = "x" ]; then - for include in /usr/share/cassandra/cassandra.in.sh \ + for include in "`dirname $0`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ /usr/local/share/cassandra/cassandra.in.sh \ - /opt/cassandra/cassandra.in.sh \ - `dirname $0`/cassandra.in.sh; do + /opt/cassandra/cassandra.in.sh; do if [ -r $include ]; then . $include break
