Changeset 5f81e923


Ignore:
Timestamp:
Dec 11, 2011 11:56:59 AM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
f8a3afd
Parents:
d9f5a86
Message:

Change my earlier tests to something POSIX compliant

[ test $condition -a test $condition ] is only used in bash

(and I want to make this script work in any bourne compatible shell)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • core/c/jbigi/mbuild_jbigi.sh

    rd9f5a86 r5f81e923  
    1919        LIBFILE="jbigi.dll";;
    2020Darwin*)
    21         JAVA_HOME=$(/usr/libexec/java_home)
     21        JAVA_HOME=$(/usr/libexec/java_home)
    2222        COMPILEFLAGS="-fPIC -Wall"
    2323        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include"
     
    3838                        JAVA_HOME="/usr/local/jdk-1.7.0"
    3939                fi
    40         elif [ $UNIXTYPE = "netbsd" ]; then
    41                 if [ -d /usr/pkg/java/openjdk7 ]; then
    42                         JAVA_HOME="/usr/pkg/java/openjdk7"
    43                 fi
    44         elif [ $UNIXTYPE = "linux" -a -e /etc/debian_version ]; then
    45                 if [ -d /usr/lib/jvm/default-java ]; then
    46                         JAVA_HOME="/usr/lib/jvm/default-java"
    47                 fi
     40        elif [ $UNIXTYPE = "netbsd" ]; then
     41                if [ -d /usr/pkg/java/openjdk7 ]; then
     42                        JAVA_HOME="/usr/pkg/java/openjdk7"
     43                fi
     44        elif [ $UNIXTYPE = "linux" ] && [ -e /etc/debian_version ]; then
     45                if [ -d /usr/lib/jvm/default-java ]; then
     46                        JAVA_HOME="/usr/lib/jvm/default-java"
     47                fi
    4848        fi
    4949        COMPILEFLAGS="-fPIC -Wall"
     
    5252        LIBFILE="libjbigi.so";;
    5353*)
    54         echo "Unsupported system type."
    55         exit 1;;
     54        echo "Unsupported system type."
     55        exit 1;;
    5656esac
    5757
Note: See TracChangeset for help on using the changeset viewer.