Changeset 20377

Timestamp:

2009-08-24T15:25:16+12:00 (15 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).

File:

• gli/trunk/findjava.sh (modified) (3 diffs)

gli/trunk/findjava.sh

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