$OpenBSD: patch-install_sh,v 1.21 2008/06/13 23:01:36 sturm Exp $ --- install.sh.orig Mon Jun 15 22:50:22 2009 +++ install.sh Wed Jun 24 11:34:52 2009 @@ -870,13 +870,16 @@ generate_wrapper() wrapper_contain="#!/bin/sh # Required for Session Management -case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac +case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=${str_paramwrapper}/\$0;; esac export OPERA_SCRIPT_PATH # Location of the Opera binaries OPERA_BINARYDIR=${str_localdirexec} export OPERA_BINARYDIR +OPERA_PERSONALDIR=.opera10 +export OPERA_PERSONALDIR + # Parse commandline parameters toset= _QTSTYLE_FROM_CMDLINE_='NO' @@ -925,9 +928,6 @@ if test \"\${OPERA_DIR}\" = '' ; then fi fi -OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" -export OPERA_LD_PRELOAD - # Native Java enviroment for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.opera\" do if test -f \"\$d/javapath.txt\" @@ -1060,9 +1060,6 @@ if test \"\${OPERA_JAVA_DIR}\"; then export LD_LIBRARY_PATH OPERA_JAVA_DIR fi -# Workarounds for the \"preloaded libXt\" problem. -LD_PRELOAD=\"libjvm.so:libawt.so:\${OPERA_LD_PRELOAD}\" -export LD_PRELOAD # To disable the first workaround, comment the next line. JAVA_WORKAROUND=\`\${OPERA_BINARYDIR}/works 2>/dev/null\` @@ -1294,7 +1291,7 @@ run_install() warn " $config_dir/operaprefs_default.ini" warn " $config_dir/operaprefs_fixed.ini" warn " would be ignored if installed with the prefix \"$prefix\"." - bool_config=1 + bool_config=0 if [ "$flag_mode" = '--interactive' ] then con_firm "Do you want to install them in $config_dir" || bool_config=0 else warn "Installing in default location $config_dir instead."