diff options
Diffstat (limited to 'sfsql.patch')
| -rw-r--r-- | sfsql.patch | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sfsql.patch b/sfsql.patch index 7ab04e469802..92554605e308 100644 --- a/sfsql.patch +++ b/sfsql.patch @@ -1,5 +1,6 @@ ---- a/client/sfsql 2015-04-27 10:51:46.081074936 +0300 -+++ b/client/sfsql 2015-04-27 10:51:09.323555791 +0300 +diff -Nur a/client/sfsql b/client/sfsql +--- a/client/sfsql 2015-09-18 22:25:07.000000000 +0300 ++++ b/client/sfsql 2015-09-18 22:31:18.395451951 +0300 @@ -4,7 +4,7 @@ # options are ignored if SF_SQL_CONNECT_URL if set @@ -9,12 +10,3 @@ HENPLUS_DIR="$( cd "${CLIENT_DIR}/henplus" && pwd )" Usage() -@@ -50,7 +50,7 @@ - FOUND=0 - for JAVA in "$JAVA1" "$JAVA2"; do - -- JAVA_VERSION=$("$JAVA" -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') -+ JAVA_VERSION=$("$JAVA" -version 2>&1| awk -F\" '/version/ {print $2}' | awk -F '.' '{print $1$2}') - - # if not integer, java not installed - if [ "$JAVA_VERSION" -eq "$JAVA_VERSION" ] 2>/dev/null ; then |