From f9ac6574561cccd6d829832166ef117ff6b7c5d2 Mon Sep 17 00:00:00 2001
From: "Bernhard K. Weisshuhn" <bkw@codingforce.com>
Date: Tue, 29 Dec 2015 15:31:33 +0100
Subject: [PATCH] jemalloc detection fails due to quoting issues in regex

patch by Bernhard K. Weisshuhn; reviewed by Robert Stupp for CASSANDRA-10946
---
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 82af7fc602..23d6bae899 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
  * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
  * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
  * Add new types to Stress (CASSANDRA-9556)
diff --git a/bin/cassandra b/bin/cassandra
index 0bbd9fb4e3..c15c1abf4d 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -153,7 +153,7 @@ case "`uname -s`" in
             which ldconfig > /dev/null 2>&1
             if [ $? = 0 ] ; then
                 # e.g. for CentOS
-                dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null | grep -v ^$'\t' | sed 's/^\([^:]*\):.*$/\1/'`"
+                dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null | grep -v '^\s' | sed 's/^\([^:]*\):.*$/\1/'`"
             else
                 # e.g. for Debian, OpenSUSE
                 dirs="/lib64 /lib /usr/lib64 /usr/lib `cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf | grep '^/'`"