geogebra/geogebra.patch

   1 *** geogebra-old        2011-10-20 20:52:05.074061651 +0200
   2 --- geogebra    2011-10-20 20:54:09.590053756 +0200
   3 ***************
   4 *** 5,18 ****
   5
   6   #---------------------------------------------
   7   # Used environment variables:
   8 ! #
   9 ! # GG_SCRIPTNAME=<name of originally called script to start GeoGebra> # If unset, name of this script will be used
  10 ! #
  11 ! # GG_PATH=<path of directory containing geogebra.jar> # If unset, path of this script will be used.
  12 ! # In this case if the path of script does not contain the geogebra.jar file, /usr/share/geogebra will be used.
  13 ! #
  14 ! # JAVACMD=<Java command> # If unset, java will be used
  15 ! #
  16   # GG_XMS=<initial Java heap size> # If unset, 32m will be used.
  17   #
  18   # GG_XMX=<maximum Java heap size> # If unset, 512m will be used.
  19 --- 5,11 ----
  20
  21   #---------------------------------------------
  22   # Used environment variables:
  23 !
  24   # GG_XMS=<initial Java heap size> # If unset, 32m will be used.
  25   #
  26   # GG_XMX=<maximum Java heap size> # If unset, 512m will be used.
  27 ***************
  28 *** 20,32 ****
  29   # GG_DJAVA_LIBRARY_PATH=<native library path>
  30
  31   #---------------------------------------------
  32 - # If GG_SCRIPTNAME not set, use name of this script
  33 -
  34 - if [ -z "$GG_SCRIPTNAME" ]; then
  35 -       GG_SCRIPTNAME=$(basename $0)
  36 - fi
  37 -
  38 - #---------------------------------------------
  39   # If GG_XMS not set, set to 32m
  40
  41   if [ -z "$GG_XMS" ]; then
  42 --- 13,18 ----
  43 ***************
  44 *** 59,65 ****
  45   func_usage()
  46   {
  47   cat << _USAGE
  48 ! Usage: $GG_SCRIPTNAME [Java-options] [GeoGebra-options] [FILE]
  49
  50   GeoGebra - Dynamic mathematics software
  51
  52 --- 45,51 ----
  53   func_usage()
  54   {
  55   cat << _USAGE
  56 ! Usage: geogebra [Java-options] [GeoGebra-options] [FILE]
  57
  58   GeoGebra - Dynamic mathematics software
  59
  60 ***************
  61 *** 90,102 ****
  62   }
  63
  64   #---------------------------------------------
  65 - # If JAVACMD not set, use java
  66 -
  67 - if [ -z "$JAVACMD" ]; then
  68 -       JAVACMD='java'
  69 - fi
  70 -
  71 - #---------------------------------------------
  72   # Check for option --help and pass Java options to Java, others to GeoGebra
  73
  74   for i in "$@"; do
  75 --- 76,81 ----
  76 ***************
  77 *** 114,136 ****
  78   done
  79
  80   #---------------------------------------------
  81 - # If GG_PATH not set, use path of this script
  82 -
  83 - if [ -z "$GG_PATH" ]; then
  84 -       GG_PATH="${BASH_SOURCE[0]}"
  85 -       if [ -h "${GG_PATH}" ]; then
  86 -               while [ -h "${GG_PATH}" ]; do
  87 -                       GG_PATH=`readlink "${GG_PATH}"`
  88 -               done
  89 -       fi
  90 -       pushd . > /dev/null
  91 -       cd `dirname ${GG_PATH}` > /dev/null
  92 -       GG_PATH=`pwd`
  93 -       popd > /dev/null
  94 -       test -r "${GG_PATH}/geogebra.jar" || GG_PATH='/usr/share/geogebra'
  95 - fi
  96 -
  97 - #---------------------------------------------
  98   # Run
  99
 100 ! exec "$JAVACMD" "${JAVA_OPTS[@]}" -jar "$GG_PATH/geogebra.jar" "${GG_OPTS[@]}" "$@"
 101 --- 93,98 ----
 102   done
 103
 104   #---------------------------------------------
 105   # Run
 106
 107 ! exec java "${JAVA_OPTS[@]}" -jar "/usr/share/java/geogebra/geogebra.jar" "${GG_OPTS[@]}" "$@"