natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change order of directory searching for c*.in.sh 

patch by Benjamin Coverston; reviewed by Ben Gamble for CASSANDRA-3983
This commit is contained in:
Aleksey Yeschenko 2013-02-22 22:30:26 +03:00
parent acf2fd47f6
commit 755328b9c5
9 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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

8
bin/cassandra
View File

@ -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

8
bin/cassandra-cli
View File

@ -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

8
bin/json2sstable
View File

@ -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

7
bin/nodetool
View File

@ -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

8
bin/sstable2json
View File

@ -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

8
bin/sstablekeys
View File

@ -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

8
bin/sstableloader
View File

@ -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

7
tools/bin/cassandra-stress
View File

@ -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