]>
Commit | Line | Data |
---|---|---|
f1851cae AM |
1 | --- opera.org 2009-12-31 11:45:05.000000000 +0100 |
2 | +++ opera 2010-01-01 20:58:33.485442895 +0100 | |
3 | @@ -45,7 +45,7 @@ | |
4 | fi | |
6caa69b5 ER |
5 | |
6 | # Required for Session Management | |
f1851cae AM |
7 | -case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/$0;; esac |
8 | +case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=/usr/bin/$0;; esac | |
6caa69b5 ER |
9 | export OPERA_SCRIPT_PATH |
10 | ||
f1851cae AM |
11 | OPERA_SYSTEM_UNAME=`uname -s` |
12 | @@ -56,6 +56,13 @@ | |
13 | [ -f "$OPERA_BINARYDIR/opera" ] || die "The Opera binary is not located at \"$OPERA_BINARYDIR/opera\"." "Please modify the wrapper script at \"$0\"." | |
14 | [ -x "$OPERA_BINARYDIR/opera" ] || die "You do not have execute rights on \"$OPERA_BINARYDIR/opera\", please ask the sysadmin to chmod +x it." | |
6caa69b5 | 15 | |
4a1d1bd2 ER |
16 | +# set JAVA_HOME from jpackage-utils if available |
17 | +if [ -f /usr/share/java-utils/java-functions ]; then | |
f1851cae AM |
18 | + . /usr/share/java-utils/java-functions |
19 | + set_jvm | |
4a1d1bd2 | 20 | +fi |
6caa69b5 | 21 | + |
f1851cae AM |
22 | + |
23 | # Opera enviroment | |
24 | if [ -z "$OPERA_DIR" ] | |
25 | then |