opera-wrapper.patch

   1 --- opera.org   2010-01-01 21:23:40.152583922 +0100
   2 +++ opera       2010-01-01 21:34:51.531475131 +0100
   3 @@ -37,15 +37,14 @@
   4  [ -z "$toset" ] || die "Missing parameter for $arg"
   5
   6
   7 -[ "$PWD" ] || PWD=`/bin/pwd`
   8  if [ "$_PERSONALDIR_FROM_CMDLINE_" = NO ]
   9  then
  10 -  OPERA_PERSONALDIR="$PWD/profile"
  11 +  OPERA_PERSONALDIR="$HOME/.opera"
  12    export OPERA_PERSONALDIR
  13  fi
  14
  15  # Required for Session Management
  16 -case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/$0;; esac
  17 +case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=/usr/bin/$0;; esac
  18  export OPERA_SCRIPT_PATH
  19
  20  OPERA_SYSTEM_UNAME=`uname -s`
  21 @@ -56,10 +55,17 @@
  22  [ -f "$OPERA_BINARYDIR/opera" ] || die "The Opera binary is not located at \"$OPERA_BINARYDIR/opera\"." "Please modify the wrapper script at \"$0\"."
  23  [ -x "$OPERA_BINARYDIR/opera" ] || die "You do not have execute rights on \"$OPERA_BINARYDIR/opera\", please ask the sysadmin to chmod +x it."
  24
  25 +# set JAVA_HOME from jpackage-utils if available
  26 +if [ -f /usr/share/java-utils/java-functions ]; then
  27 +    . /usr/share/java-utils/java-functions
  28 +    set_jvm
  29 +fi
  30 +
  31 +
  32  # Opera enviroment
  33  if [ -z "$OPERA_DIR" ]
  34  then
  35 -    OPERA_DIR="$PWD/usr/share/opera"
  36 +    OPERA_DIR="/usr/share/opera"
  37  fi
  38  export OPERA_DIR
  39
  40 @@ -357,7 +363,7 @@
  41
  42  # Setting environment relative to current working directory
  43  # Bundled Qt will be found here unless preloaded by the stance above
  44 -LD_LIBRARY_PATH="$PWD/usr/lib/opera${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
  45 +LD_LIBRARY_PATH="$OPERA_BINARYDIR/${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
  46  export LD_LIBRARY_PATH
  47
  48  # Run Opera: