geogebra-beta/geogebra.patch

   1 --- geogebra-old        2011-09-20 16:51:31.000000000 +0200
   2 +++ geogebra    2011-09-21 17:20:25.218322890 +0200
   3 @@ -6,13 +6,6 @@
   4  #---------------------------------------------
   5  # Used environment variables:
   6  #
   7 -# GG_SCRIPTNAME=<name of originally called script to start GeoGebra> # If unset, name of this script will be used
   8 -#
   9 -# GG_PATH=<path of directory containing geogebra.jar> # If unset, path of this script will be used.
  10 -# In this case if the path of script does not contain the geogebra.jar file, /usr/share/geogebra will be used.
  11 -#
  12 -# JAVACMD=<Java command> # If unset, java will be used
  13 -#
  14  # GG_XMS=<initial Java heap size> # If unset, 32m will be used.
  15  #
  16  # GG_XMX=<maximum Java heap size> # If unset, 512m will be used.
  17 @@ -90,13 +83,6 @@
  18  }
  19
  20  #---------------------------------------------
  21 -# If JAVACMD not set, use java
  22 -
  23 -if [ -z "$JAVACMD" ]; then
  24 -       JAVACMD='java'
  25 -fi
  26 -
  27 -#---------------------------------------------
  28  # Check for option --help and pass Java options to Java, others to GeoGebra
  29
  30  for i in "$@"; do
  31 @@ -114,23 +100,6 @@
  32  done
  33
  34  #---------------------------------------------
  35 -# If GG_PATH not set, use path of this script
  36 -
  37 -if [ -z "$GG_PATH" ]; then
  38 -       GG_PATH="${BASH_SOURCE[0]}"
  39 -       if [ -h "${GG_PATH}" ]; then
  40 -               while [ -h "${GG_PATH}" ]; do
  41 -                       GG_PATH=`readlink "${GG_PATH}"`
  42 -               done
  43 -       fi
  44 -       pushd . > /dev/null
  45 -       cd `dirname ${GG_PATH}` > /dev/null
  46 -       GG_PATH=`pwd`
  47 -       popd > /dev/null
  48 -       test -r "${GG_PATH}/geogebra.jar" || GG_PATH='/usr/share/geogebra'
  49 -fi
  50 -
  51 -#---------------------------------------------
  52  # Run
  53
  54 -exec "$JAVACMD" "${JAVA_OPTS[@]}" -jar "$GG_PATH/geogebra.jar" "${GG_OPTS[@]}" "$@"
  55 +exec java "${JAVA_OPTS[@]}" -jar "/usr/share/java/geogebra/geogebra.jar" "${GG_OPTS[@]}" "$@"