diff --git a/installation/resource/tarball/run-console.sh b/installation/resource/tarball/run-console.sh index 13665502284c46d77989d8052c13c39afea0db91..85acdb4ed75487fe6c562a1bc5cc66992ded2876 100755 --- a/installation/resource/tarball/run-console.sh +++ b/installation/resource/tarball/run-console.sh @@ -1,5 +1,25 @@ #!/bin/bash +#Detect Java version + +if type -p java; then + _java=java +else + echo "Java not available" +fi + +if [[ "$_java" ]]; then + version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}') + if [[ "$version" > "1.6" ]]; then + echo Java version $version found. + else + echo Java version $version found is under the required 1.7. + exit -1 + fi +fi + +#Continue installation + # # reads the 'admin' user password from the console # diff --git a/installation/resource/tarball/run-ui.sh b/installation/resource/tarball/run-ui.sh index 05c96a711a1429b29acb6b6d6002e2319f5c9b8b..90a0ab1a4fbcff07b68b8f3a65e50ed53330523e 100755 --- a/installation/resource/tarball/run-ui.sh +++ b/installation/resource/tarball/run-ui.sh @@ -1,5 +1,25 @@ #!/bin/bash +#Detect Java version + +if type -p java; then + _java=java +else + echo "Java not available" +fi + +if [[ "$_java" ]]; then + version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}') + if [[ "$version" > "1.6" ]]; then + echo Java version $version found. + else + echo Java version $version found is under the required 1.7. + exit -1 + fi +fi + +#Continue installation + BASE=`dirname "$0"` if [ ${BASE#/} == ${BASE} ]; then BASE="`pwd`/${BASE}"