summaryrefslogtreecommitdiff
path: root/editors/openoffice-3
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2003-09-25 22:28:01 +0000
committerMartin Blapp <mbr@FreeBSD.org>2003-09-25 22:28:01 +0000
commitae404036e5faea1ce70d04ba0a786e1b2d689586 (patch)
treee95ea451dcb328494872af33c186c65ffa2d7954 /editors/openoffice-3
parentVendor update to 1.16 (diff)
Directly get OOHOME from .sversionrc. Add several checks for
the various installation steps.
Notes
Notes: svn path=/head/; revision=89391
Diffstat (limited to 'editors/openoffice-3')
-rw-r--r--editors/openoffice-3/files/freebsd-local.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/editors/openoffice-3/files/freebsd-local.sh b/editors/openoffice-3/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice-3/files/freebsd-local.sh
+++ b/editors/openoffice-3/files/freebsd-local.sh
@@ -2,7 +2,10 @@
#
# $FreeBSD $
-OOHOME="$HOME/OpenOffice.org%%FRELEASE_NR%%"
+if [ -e $HOME/.sversionrc ]; then
+ OOHOME=`grep %%FRELEASE_NR%% $HOME/.sversionrc \
+ | sed -e 's/.*file:\/\///'`
+fi
save_common_xcu() {
sed 's/^X//' > $OOHOME/tmp/Common.xcu << 'END-of-Common.xcu'
@@ -58,7 +61,7 @@ fi
#
# Create soffice.cfg if it does not exist.
#
-if [ -e $OOHOME/setup ]; then
+if [ ! -z $OOHOME ] && [ -e $OOHOME/setup ]; then
if [ ! -e $OOHOME/user/config/soffice.cfg ]; then
touch $OOHOME/user/config/soffice.cfg
fi
@@ -67,7 +70,7 @@ fi
#
# Detect installed mozilla
#
-if [ ! -e $OOHOME/user/registry/data/org/openoffice/Office/Common.xcu ]; then
+if [ ! -z $OOHOME ] && [ ! -e $OOHOME/user/registry/data/org/openoffice/Office/Common.xcu ]; then
mkdir -p $OOHOME/tmp;
save_common_xcu;
fi