GuillaumeHemmen/projectlibre-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/projectlibre/code synced 2024-11-01 03:21:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
claur 2015-07-31 16:33:44 +02:00
commit 3f5ba25991
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openproj_build/resources/projectlibre
View file

@ -113,7 +113,7 @@ check_java() {
"$JAVA_EXE" -version > "$VERSION_FILE" 2>&1 || rm -f "$VERSION_FILE"
if [ -r "$VERSION_FILE" ]; then
JAVA_VERSION=`cat "$VERSION_FILE" | awk '/^java version/ { print substr($3, 2, length($3)-2); }'`
JAVA_VERSION=`cat "$VERSION_FILE" | awk '/^(java|openjdk) version/ { print substr($3, 2, length($3)-2); }'`
if [ "x$OS_NAME" = "xSunOS" ]; then
echo " Java version: $JAVA_VERSION \c"
else
@ -128,7 +128,7 @@ check_java() {
if [ "$JAVA_VERSION" ]; then
if [ "$JAVA_VERSION" -ge "$MIN_JAVA_VERSION" ]; then
echo "OK"
JAVA_IMPL=`cat "$VERSION_FILE" | awk '/^java version/ { getline; print $1; }'`
JAVA_IMPL=`cat "$VERSION_FILE" | awk '/^(java|openjdk) version/ { getline; print $1; }'`
if [ "x$OS_NAME" = "xSunOS" ]; then
echo " Java implementation: $JAVA_IMPL \c"
else

4
openproj_build/resources/projectlibre.sh
View file

@ -113,7 +113,7 @@ check_java() {
"$JAVA_EXE" -version > "$VERSION_FILE" 2>&1 || rm -f "$VERSION_FILE"
if [ -r "$VERSION_FILE" ]; then
JAVA_VERSION=`cat "$VERSION_FILE" | awk '/^java version/ { print substr($3, 2, length($3)-2); }'`
JAVA_VERSION=`cat "$VERSION_FILE" | awk '/^(java|openjdk) version/ { print substr($3, 2, length($3)-2); }'`
if [ "x$OS_NAME" = "xSunOS" ]; then
echo " Java version: $JAVA_VERSION \c"
else
@ -128,7 +128,7 @@ check_java() {
if [ "$JAVA_VERSION" ]; then
if [ "$JAVA_VERSION" -ge "$MIN_JAVA_VERSION" ]; then
echo "OK"
JAVA_IMPL=`cat "$VERSION_FILE" | awk '/^java version/ { getline; print $1; }'`
JAVA_IMPL=`cat "$VERSION_FILE" | awk '/^(java|openjdk) version/ { getline; print $1; }'`
if [ "x$OS_NAME" = "xSunOS" ]; then
echo " Java implementation: $JAVA_IMPL \c"
else