Fixed if conditions in cassandra-env.sh for cassandra versions 2.2 and 3.0
Change-Id: Ic1cf0f5bf154cec62206935735103baea6be6332
diff --git a/opencontrail/files/2.2/database/cassandra-env.sh b/opencontrail/files/2.2/database/cassandra-env.sh
index 2ca323e..ba438ec 100644
--- a/opencontrail/files/2.2/database/cassandra-env.sh
+++ b/opencontrail/files/2.2/database/cassandra-env.sh
@@ -94,12 +94,12 @@
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
-if [ "$JVM_VERSION" \< "1.7" ] ; then
+if [ "$JVM_VERSION" -lt "1.7" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi
-if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "25" ] ; then
+if [ "$JVM_VERSION" -lt "1.8" ] && [ "$JVM_PATCH_VERSION" -lt "25" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi
@@ -229,7 +229,7 @@
JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=10000"
# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
-if { [ "$JVM_VERSION" \> "1.7" ] && [ "$JVM_VERSION" \< "1.8.0" ] && [ "$JVM_PATCH_VERSION" -ge "60" ]; } || [ "$JVM_VERSION" \> "1.8" ] ; then
+if { [ "$JVM_VERSION" -gt "1.7" ] && [ "$JVM_VERSION" -lt "1.8.0" ] && [ "$JVM_PATCH_VERSION" -ge "60" ]; } || [ "$JVM_VERSION" -gt "1.8" ] ; then
JVM_OPTS="$JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways -XX:CMSWaitDuration=10000"
fi
diff --git a/opencontrail/files/3.0/database/cassandra-env.sh b/opencontrail/files/3.0/database/cassandra-env.sh
index 2ca323e..ba438ec 100644
--- a/opencontrail/files/3.0/database/cassandra-env.sh
+++ b/opencontrail/files/3.0/database/cassandra-env.sh
@@ -94,12 +94,12 @@
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
-if [ "$JVM_VERSION" \< "1.7" ] ; then
+if [ "$JVM_VERSION" -lt "1.7" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi
-if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "25" ] ; then
+if [ "$JVM_VERSION" -lt "1.8" ] && [ "$JVM_PATCH_VERSION" -lt "25" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi
@@ -229,7 +229,7 @@
JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=10000"
# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
-if { [ "$JVM_VERSION" \> "1.7" ] && [ "$JVM_VERSION" \< "1.8.0" ] && [ "$JVM_PATCH_VERSION" -ge "60" ]; } || [ "$JVM_VERSION" \> "1.8" ] ; then
+if { [ "$JVM_VERSION" -gt "1.7" ] && [ "$JVM_VERSION" -lt "1.8.0" ] && [ "$JVM_PATCH_VERSION" -ge "60" ]; } || [ "$JVM_VERSION" -gt "1.8" ] ; then
JVM_OPTS="$JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways -XX:CMSWaitDuration=10000"
fi