diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 10:34:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 10:34:28 +0000 |
| commit | cdf447fcd58e8a22e8725c9c0f130f67e8b9675a (patch) | |
| tree | e32c0a11ae16bb4f9b2452fc8081aac27e4ec9a1 /setup_native/scripts | |
| parent | bc4fd4e83199fd074759c6cfd61c9916199aa7ee (diff) | |
INTEGRATION: CWS sysui03 (1.4.8); FILE MERGED
2005/01/14 07:08:52 obr 1.4.8.2: #i39410# check for gnome packages and other enhancements
2005/01/11 08:04:35 obr 1.4.8.1: #i39755#,#i33855# Moved Solaris desktop integration into a single package. Moved the start scripts in /usr/bin into the desktop integration packages and made the module launchers symbolic links into the office installation.
Diffstat (limited to 'setup_native/scripts')
| -rw-r--r-- | setup_native/scripts/install_solaris.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/setup_native/scripts/install_solaris.sh b/setup_native/scripts/install_solaris.sh index 514c9af68038..9c1b5b4e5039 100644 --- a/setup_native/scripts/install_solaris.sh +++ b/setup_native/scripts/install_solaris.sh @@ -85,15 +85,22 @@ fi # COREPKG=`find $PACKAGE_PATH/* -type d -prune -name "*-core*" -print` -PKGLIST=`find $PACKAGE_PATH/* -type d -prune ! -name "*adabas*" ! -name "*j3*" ! -name "*-gnome*" ! -name "*-cde*" ! -name "*-core*" -print` +PKGLIST=`find $PACKAGE_PATH/* -type d -prune ! -name "*adabas*" ! -name "*j3*" ! -name "*-desktop-int*" ! -name "*-cde*" ! -name "*-core*" ! -name "*-gnome*" -print` if [ -z "$COREPKG" ] then error "No core package found in directory $PACKAGE_PATH" fi +# Do not install gnome-integration package on systems without GNOME +pkginfo -q SUNWgnome-vfs +if [ $? -eq 0 ] +then + GNOMEPKG=`find $PACKAGE_PATH/* -type d -prune -name "*-gnome*" -print` +fi + echo "Packages found:" -for i in $COREPKG $PKGLIST; do +for i in $COREPKG $PKGLIST $GNOMEPKG; do echo `basename $i` done @@ -152,7 +159,7 @@ echo "Path to the installation : " $MY_ROOT export LD_PRELOAD=$GETUID_SO -for i in $COREPKG $PKGLIST; do +for i in $COREPKG $PKGLIST $GNOMEPKG; do echo /usr/sbin/pkgadd -a $ADMINFILE -d $PACKAGE_PATH -R $MY_ROOT `basename $i` /usr/sbin/pkgadd -a $ADMINFILE -d $PACKAGE_PATH -R $MY_ROOT `basename $i` done @@ -172,6 +179,10 @@ then ln -s $INSTALLDIR/program/soffice $HOME/soffice fi +# patch the "bootstraprc" to create a self-containing installation +mv $INSTALLDIR/program/bootstraprc $INSTALLDIR/program/bootstraprc.orig +sed 's/UserInstallation=$SYSUSERCONFIG\/.staroffice8/UserInstallation=$ORIGIN\/..\/UserInstallation/g' $INSTALLDIR/program/bootstraprc.orig > $INSTALLDIR/program/bootstraprc + echo echo "Installation done ..." |