[3/6] cassandra git commit: cqlsh cannot be called through symlink

[ca...@apache.org]

cqlsh cannot be called through symlink

patch by Benjamin Zarzycki; reviewed by Carl Yeksigian for CASSANDRA-11037


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4985fcc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4985fcc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4985fcc8

Branch: refs/heads/trunk
Commit: 4985fcc86f8b28887c5ed41e538354ab07cb6f70
Parents: 71f4406
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Feb 18 15:48:54 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Thu Feb 18 15:48:54 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 bin/cqlsh   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4985fcc8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 10f23af..d3dcdbc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
  * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
  * Protect from keyspace dropped during repair (CASSANDRA-11065)
  * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4985fcc8/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 5594f82..89d094f 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -16,4 +16,4 @@
 # limitations under the License.
 
 
-python "`dirname "$0"`/cqlsh.py" "$@"
+python "`python -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"