diff options
Diffstat (limited to 'app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3')
| -rw-r--r-- | app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 | 110 |
1 files changed, 14 insertions, 96 deletions
diff --git a/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 index bb980f3f6082..c12d92e91bd1 100644 --- a/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 +++ b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 @@ -43,6 +43,10 @@ if [ -e "$HOME/.sversionrc" ] ; then sed -i -e s/1.1.3/1.1.4/g $HOME/.sversionrc fi +if [ ! -f "/proc/version" ] ; then + echo "--- Warning - OO.o will not work without a mounted /proc filesystem ---" +fi + ### ### Get user settings directory from ~/.sversionrc and echo directory name to stdout ### get_settings_dir <Version> @@ -76,41 +80,18 @@ if [ $? -eq 2 ] ; then fi ## -## Unset SESSION_MANAGER if gnome-session is the session manager -## See http://www.openoffice.org/issues/show_bug.cgi?id=4494 +## Add /usr/share/fonts to font search path ## -SMPID=`echo $SESSION_MANAGER | sed --quiet "s,local.*/,,p"` -if [ -n "$SMPID" ] && [ -L /proc/"$SMPID"/exe ]; then - SESMGR="`readlink -f /proc/$SMPID/exe`" - case "$SESMGR" in - /usr/bin/gnome-session*) - echo "Gnome session manager detected - session management disabled" - unset SESSION_MANAGER - ;; - esac -fi +# Default font path. This is used if SAL_FONTPATH_PRIVATE is not defined. -## -## Add known Debian fonts locations to search path -## -## Please report if you have problems with fonts, or know of non-defoma integrated packages that place fonts in other -## paths. -## - -# Default font path. This is used if SAL_FONTPATH_USER is not defined. -DEBOO_FONTPATH="/usr/lib/X11/fonts/misc/;/usr/lib/X11/fonts/cyrillic/;\ -/usr/lib/X11/fonts/100dpi/:unscaled;/usr/lib/X11/fonts/75dpi/:unscaled;\ -/usr/lib/X11/fonts/Type1/;/usr/lib/X11/fonts/CID;/usr/lib/X11/fonts/Speedo/;\ -/usr/lib/X11/fonts/100dpi/;/usr/lib/X11/fonts/75dpi/;\ -/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType;\ -/usr/lib/X11/fonts/TrueType;\ -/usr/share/fonts/truetype/kochi;\ -/usr/lib/X11/fonts/TrueType/larabie-straight;\ -/usr/lib/X11/fonts/TrueType/larabie-uncommon" +GENTOO_FONTPATH="" +for d in `find /usr/share/fonts -maxdepth 1 -mindepth 1 -type d` ; do + GENTOO_FONTPATH="$GENTOO_FONTPATH;$d" +done -SAL_FONTPATH_USER=${SAL_FONTPATH_USER:-"$DEBOO_FONTPATH"} -export SAL_FONTPATH_USER +SAL_FONTPATH_PRIVATE=${SAL_FONTPATH_PRIVATE:-"$GENTOO_FONTPATH"} +export SAL_FONTPATH_PRIVATE ## search LOCALE if [ -n "$LC_ALL" ]; then @@ -138,15 +119,6 @@ if [ -z "$OOHOME" ] ; then if [ -e /etc/openoffice/autoresponse-<pv>.conf ] && \ grep -q DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf ; then -# Do not take old settings as migration results in broken behaviour -# -# UPDATEFLAG="" -# if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then -# OOHOME="$oldhome" -# echo "Using settings from 1.0.3: /${oldhome}" -# /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.sversionrc -# UPDATEFLAG="-update:/$oldhome" -# fi # first install OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \ sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"` @@ -159,14 +131,11 @@ if [ -z "$OOHOME" ] ; then fi echo "running openoffice.org setup..." - if ! /opt/OpenOffice.org/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then + if ! /opt/OpenOffice.org/program/setup -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then echo "setup failed.. abort" exit 1 fi - -# fi - echo "Setup complete. Running openoffice.org..." else @@ -187,8 +156,8 @@ if [ $# = 0 ]; then oodraw) set -- private:factory/sdraw;; ooimpress) set -- private:factory/simpress;; oomath) set -- private:factory/smath;; + ooweb) set -- private:factory/swriter/web;; oowriter) set -- private:factory/swriter;; - oohtml) set -- private:factory/swriter/web;; oomaster) set -- private:factory/swriter/Global;; esac fi @@ -196,23 +165,6 @@ fi ## Previous dead installation? [ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used" -# There is no locale import file -## Change the ooLocale key in SETUPFILE acording to LOCALE -#TMPFILE=`mktemp -t oooLocale.XXXXXXXXXX` && { -# cat >${TMPFILE} <<EOF -#<?xml version="1.0" encoding="UTF-8"?> -#<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice"> -# <node oor:name="L10N"> -# <prop oor:name="ooLocale" oor:type="xs:string"> -# <value>$LOCALEOO</value> -# </prop> -# </node> -#</oor:node> -#EOF -# ooconfigimport $TMPFILE >/dev/null -# rm -f ${TMPFILE} -#} - # Check whether the programs actually link to anything, or are from an old # version. @@ -243,37 +195,3 @@ case `basename $0` in *) exec "$OOHOME/soffice" "$@" ;; esac -## Changelog -# 2003/04/01 halls -# * Version 1.1beta -# 2003/02/03 halls -# * Check for nonexistent ooLocale every run -# 2003/01/09 halls -# * Version 1.0.2 -# 12/15 saviot -# * Change ooLocale at startup in Setup.xml -# <ooLocale cfg:type="string"/> doesn't work for help. -# 12/03 challs -# * Add Debian font paths to user font path -# 11/14 saviot -# * correct handling of UI language -# * don't change Linguistic.xml after first startup(#168780) -# * TODO: provide better defaults on first startup -# 10/03 challs -# * Fix use with LC_ALL -# 07/10 challs -# * use 1.0.1 directory and improve error checking -# 07/02 challs -# * use readlink in /proc/PID/exe to get -# real session manager name -# 06/12 challs -# * merge into main package -# * change $@ to "$@" -# * source configuration file: -# /etc/openoffice/openoffice.conf -# 06/12 mquinson -# * strace only when DEBUG is set to yes -# * readd the $@ to pass the args to soffice -# 06/06 mquinson -# * Make sure the OLDLOCALE is never empty -# * handle the case where the locale is C |