Changeset 19737

Show
Ignore:
Timestamp:
04.06.2009 16:55:56 (10 years ago)
Author:
ak19
Message:

Bugfix in branches that hadn't been executed so far: can't call return on a function that returns a value. Also made glilang a parameter, since findjava.sh is now almost duplicated for the GS2 installation folder as well, which can't be using glilang. Now the variable is called gslang inside the findjava.sh script.

Location:
gli/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/client-gli.sh

    r19403 r19737  
    8686# call the script with source, so that we have the variables it sets ($javapath) 
    8787exit_status=0 
    88 source ./findjava.sh 
     88source ./findjava.sh $glilang 
    8989exit_status=$? 
    9090if [ "$exit_status" -eq 1 ]; then 
  • gli/trunk/findjava.sh

    r19403 r19737  
    1010 
    1111    if [ "x$JAVA_HOME" = "x" -o ! -f "$JAVA_HOME/bin/java" ]; then 
    12     return no_java "$MIN_DISPLAY_VERSION" 
     12    no_java "$MIN_DISPLAY_VERSION" 
     13    return $? 
    1314    else 
    1415    # There is a JAVA_HOME already set, we're going to try using that 
     
    1718    # Print a warning that we're going to use whatever JAVA_HOME is set (fingers crossed) 
    1819    echo 
    19     if [ "x$glilang" = "x" -o "$glilang" = "en" ]; then 
     20    if [ "x$gslang" = "x" -o "$gslang" = "en" ]; then 
    2021        echo "***************************************************************************" 
    2122        echo "WARNING: " 
     
    3637 
    3738    echo 
    38     if [ "$glilang" = "es" ]; then 
     39    if [ "$gslang" = "es" ]; then 
    3940    echo "No se pudo localizar una versión apropiada de Java. Usted deberá " 
    4041    echo "instalar un Ambiente de Ejecución Java (versión $MINIMUM_DISPLAY_VERSION o superior) " 
    4142    echo "antes de correr la Interfaz de la $PROGNAME." 
    42     elif [ "$glilang" = "fr" ]; then 
     43    elif [ "$gslang" = "fr" ]; then 
    4344    echo "Une version adéquate de Java n'a pas pu être localisée." 
    4445    echo "Vous devez installer un Java Runtime Environment (version $MINIMUM_DISPLAY_VERSION ou" 
     
    4647    echo "Si vous avez Java installé sur votre ordinateur veuillez vérifier la variable" 
    4748    echo "d'environnement JAVA_HOME." 
    48     elif [ "$glilang" = "ru" ]; then 
     49    elif [ "$gslang" = "ru" ]; then 
    4950    echo "îÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÍÅÓÔÏÎÁÈÏÖÄÅÎÉÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ×ÅÒÓÉÉ Java." 
    5051    echo "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ Java Runtime Environment (×ÅÒÓÉÀ $MINIMUM_DISPLAY_VERSION ÉÌÉ ×ÙÛÅ)" 
     
    7980        if [ "$?" = "0" ]; then 
    8081         
    81             if [ "$glilang" = "es" ]; then 
     82            if [ "$gslang" = "es" ]; then 
    8283                echo "La versión del Ambiente de Ejecución Java (JRE por sus siglas en " 
    8384                echo "inglés) que usted tiene instalada es demasiado vieja para ejecutar " 
     
    8586                echo "una nueva versión del Ambiente de Ejecución Java (versión $MIN_DISPLAY_VERSION o " 
    8687                echo "posterior) y ejecute nuevamente este guión." 
    87             elif [ "$glilang" = "fr" ]; then 
     88            elif [ "$gslang" = "fr" ]; then 
    8889                echo "La version de Java Runtime Environment que vous avez installée est" 
    8990                echo "trop vielle pour faire fonctionner $PROGNAME." 
    9091                echo "Veuillez installer une nouvelle version du JRE (version $MIN_DISPLAY_VERSION ou plus" 
    9192                echo "récente) et redémarrez le script." 
    92             elif [ "$glilang" = "ru" ]; then 
     93            elif [ "$gslang" = "ru" ]; then 
    9394                echo "÷ÅÒÓÉÑ Java Runtime Environment, ËÏÔÏÒÕÀ ÷Ù ÕÓÔÁÎÏ×ÉÌÉ, ÏÞÅÎØ ÓÔÁÒÁ," 
    9495                echo "ÞÔÏÂÙ ÕÐÒÁ×ÌÑÔØ ÂÉÂÌÉÏÔÅÞÎÙÍ $PROGNAME. ðÏÖÁÌÕÊÓÔÁ, " 
     
    103104         
    104105        else 
    105         return no_java "$MIN_DISPLAY_VERSION" 
     106        no_java "$MIN_DISPLAY_VERSION" 
     107        return $? 
    106108        fi 
    107109     
     
    117119# Some users may set this line manually 
    118120#JAVA_HOME= 
    119  
     121gslang=$1 
    120122MINIMUM_JAVA_VERSION=1.4.0_00 
    121123MIN_DISPLAY_VERSION=1.4 
  • gli/trunk/gli.sh

    r19403 r19737  
    8282# call the script with source, so that we have the variables it sets ($javapath) 
    8383exit_status=0 
    84 source ./findjava.sh 
     84source ./findjava.sh $glilang 
    8585exit_status=$? 
    8686if [ "$exit_status" -eq 1 ]; then