colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-13 06:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: bootstrap.sh cannot filter the OpenRDK version key out correctly.

Browse Source 
When running ./bootstrap.sh, it will print the error message:
"./bootstrap.sh: line 138: [: too many arguments"

This fix correct it by filtering out the OpenRDK Runtime Environment line.

Fixes #2179
This commit is contained in:
kevin-xu
2014-08-28 20:14:35 -07:00
parent b92214461e
commit 75a4d8a2b9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap.sh
+3 -2
View File
@@ -134,8 +134,9 @@ function check_install_environment () {
java_version=$(java -version 2>&1)
echo $java_version | grep OpenJDK > /dev/null
if [ "$?" = "0" ]; then # OpenJDK: make sure >= 6b18
openjdk_version=$(echo $java_version | egrep -o '[0-9]\-?b[0-9]+')
if [ $(echo $openjdk_version | tr -d 'b' | tr -d '-') -lt 618 ]; then
openjdk_version=$(echo "$java_version" | grep "OpenJDK Runtime Environment")
openjdk_version_key=$(echo $openjdk_version | egrep -o '[0-9]\-?b[0-9]+')
if [ $(echo $openjdk_version_key | tr -d 'b' | tr -d '-') -lt 618 ]; then
echo "Error: Narwhal is not compatible with your version of OpenJDK: $openjdk_version."
echo "Please upgrade to OpenJDK >= 6b18 or switch to the Sun JVM. Then re-run bootstrap.sh."
exit 1