diff options
| author | Botao Sun <botao.sun@linaro.org> | 2014-10-21 22:12:00 +1100 |
|---|---|---|
| committer | Botao Sun <botao.sun@linaro.org> | 2014-10-21 22:12:20 +1100 |
| commit | d8df19275b1e82cc849df6eab68b73d155c32806 (patch) | |
| tree | 40a9b6c8ea0bef2e1af2fe4277480085420120f3 /openembedded/scripts | |
| parent | 6794896317b85facf2249469e6d79674beba2794 (diff) | |
openjdk-version.sh: POSIX Compliant Update.
This change is to make the test script to be POSIX compliant.
Original patch comes from:
Lucas Dutra Nunes <ldnunes@ossystems.com.br>
Signed-off by: Botao Sun <botao.sun@linaro.org>
Change-Id: Ic0e817116cc7f67f638889334d6cdd194aa3c055
Diffstat (limited to 'openembedded/scripts')
| -rwxr-xr-x | openembedded/scripts/openjdk-version.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/openembedded/scripts/openjdk-version.sh b/openembedded/scripts/openjdk-version.sh index 9b19f06..44bdb61 100755 --- a/openembedded/scripts/openjdk-version.sh +++ b/openembedded/scripts/openjdk-version.sh @@ -1,8 +1,8 @@ -#!/bin/bash +#!/bin/sh # # OpenJDK execution and version test. # -# Copyright (C) 2013, Linaro Limited. +# Copyright (C) 2010 - 2014, Linaro Limited. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,10 +16,10 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # Author: Andrew McDermott <andrew.mcdermott@linaro.org> -# +# Maintainer: Botao Sun <botao.sun@linaro.org> if [ $# -eq 0 ]; then echo "usage: $0 <version>" @@ -32,16 +32,16 @@ rm -f JavaVersion.java JavaVersion.class echo ' class JavaVersion { - public static void main(String[] args) { - System.out.println(System.getProperty("java.version")); - } + public static void main(String[] args) { + System.out.println(System.getProperty("java.version")); + } }' > JavaVersion.java javac JavaVersion.java if [ $? -ne 0 ]; then - echo "openjdk-version: fail" - exit 1 + echo "openjdk-version: fail" + exit 1 fi actual_version=`java JavaVersion` @@ -50,12 +50,12 @@ echo "actual version: $actual_version" echo "expected version: $version" if [ $? -eq 0 ]; then - if [[ "$actual_version" =~ "$version" ]]; then - echo "openjdk-version: pass" - exit 0 + if [ "$actual_version" = "$version" ]; then + echo "openjdk-version: pass" + exit 0 else - echo "openjdk-version: fail" - exit 1 + echo "openjdk-version: fail" + exit 1 fi else echo "openjdk-version: fail" |