Changeset 20377

Show
Ignore:
Timestamp:
24.08.2009 15:25:16 (10 years ago)
Author:
ak19
Message:

Adjusting hint to JAVA_HOME for darwin since the earlier hint didn't work on Veronica's Macbook Tiger OS (10.4).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/findjava.sh

    r20186 r20377  
    3939    if [ "$gslang" = "es" ]; then 
    4040    echo "No se pudo localizar una versión apropiada de Java. Usted deberá " 
    41     echo "instalar un Ambiente de Ejecución Java (versión $MINIMUM_DISPLAY_VERSION o superior) " 
     41    echo "instalar un Ambiente de Ejecución Java (versión $MIN_DISPLAY_VERSION o superior) " 
    4242    echo "antes de correr la Interfaz de la $PROGNAME." 
    4343    elif [ "$gslang" = "fr" ]; then 
    4444    echo "Une version adéquate de Java n'a pas pu être localisée." 
    45     echo "Vous devez installer un Java Runtime Environment (version $MINIMUM_DISPLAY_VERSION ou" 
     45    echo "Vous devez installer un Java Runtime Environment (version $MIN_DISPLAY_VERSION ou" 
    4646    echo "supérieur) avant de démarrer $PROGNAME." 
    4747    echo "Si vous avez Java installé sur votre ordinateur veuillez vérifier la variable" 
     
    4949    elif [ "$gslang" = "ru" ]; then 
    5050    echo "îÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÍÅÓÔÏÎÁÈÏÖÄÅÎÉÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ×ÅÒÓÉÉ Java." 
    51     echo "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ Java Runtime Environment (×ÅÒÓÉÀ $MINIMUM_DISPLAY_VERSION ÉÌÉ ×ÙÛÅ)" 
     51    echo "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ Java Runtime Environment (×ÅÒÓÉÀ $MIN_DISPLAY_VERSION ÉÌÉ ×ÙÛÅ)" 
    5252    echo "ÐÅÒÅÄ ××ÏÄÏÍ ÂÉÂÌÉÏÔÅÞÎÏÇÏ $PROGNAME." 
    5353    else 
    5454    echo "Failed to locate an appropriate version of Java. You must install a" 
    55     echo "Java Runtime Environment (version $MINIMUM_DISPLAY_VERSION or greater) before running the" 
     55    echo "Java Runtime Environment (version $MIN_DISPLAY_VERSION or greater) before running the" 
    5656    echo "$PROGNAME." 
    5757    echo "If you have Java intalled on your machine please set the environment variable JAVA_HOME." 
     
    6969    HINT=`cd "$GSDLHOME";pwd`/packages/jre 
    7070    elif [ $GSDLOS = darwin ]; then 
    71     HINT=/System/Library/Frameworks/JavaVM.framework/Home 
     71    HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home 
     72        #/System/Library/Frameworks/JavaVM.framework/Home 
    7273    fi   
    7374