summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/openoffice-1.1-devel/files/freebsd-local.sh9
-rw-r--r--editors/openoffice-1.1/files/freebsd-local.sh9
-rw-r--r--editors/openoffice-2.0-devel/files/freebsd-local.sh9
-rw-r--r--editors/openoffice-3-devel/files/freebsd-local.sh9
-rw-r--r--editors/openoffice-3/files/freebsd-local.sh9
-rw-r--r--editors/openoffice-devel/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-1.1-devel/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-1.1/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-2-RC/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-2-devel/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-2.0-devel/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-2.0/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-2/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-3-RC/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-3-devel/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-3/files/freebsd-local.sh9
-rw-r--r--editors/openoffice.org-vcltesttool/files/freebsd-local.sh9
17 files changed, 102 insertions, 51 deletions
diff --git a/editors/openoffice-1.1-devel/files/freebsd-local.sh b/editors/openoffice-1.1-devel/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice-1.1-devel/files/freebsd-local.sh
+++ b/editors/openoffice-1.1-devel/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
diff --git a/editors/openoffice-1.1/files/freebsd-local.sh b/editors/openoffice-1.1/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice-1.1/files/freebsd-local.sh
+++ b/editors/openoffice-1.1/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
diff --git a/editors/openoffice-2.0-devel/files/freebsd-local.sh b/editors/openoffice-2.0-devel/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice-2.0-devel/files/freebsd-local.sh
+++ b/editors/openoffice-2.0-devel/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
diff --git a/editors/openoffice-3-devel/files/freebsd-local.sh b/editors/openoffice-3-devel/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice-3-devel/files/freebsd-local.sh
+++ b/editors/openoffice-3-devel/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
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
diff --git a/editors/openoffice-devel/files/freebsd-local.sh b/editors/openoffice-devel/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice-devel/files/freebsd-local.sh
+++ b/editors/openoffice-devel/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
diff --git a/editors/openoffice.org-1.1-devel/files/freebsd-local.sh b/editors/openoffice.org-1.1-devel/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-1.1-devel/files/freebsd-local.sh
+++ b/editors/openoffice.org-1.1-devel/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
diff --git a/editors/openoffice.org-1.1/files/freebsd-local.sh b/editors/openoffice.org-1.1/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-1.1/files/freebsd-local.sh
+++ b/editors/openoffice.org-1.1/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
diff --git a/editors/openoffice.org-2-RC/files/freebsd-local.sh b/editors/openoffice.org-2-RC/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-2-RC/files/freebsd-local.sh
+++ b/editors/openoffice.org-2-RC/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
diff --git a/editors/openoffice.org-2-devel/files/freebsd-local.sh b/editors/openoffice.org-2-devel/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-2-devel/files/freebsd-local.sh
+++ b/editors/openoffice.org-2-devel/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
diff --git a/editors/openoffice.org-2.0-devel/files/freebsd-local.sh b/editors/openoffice.org-2.0-devel/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-2.0-devel/files/freebsd-local.sh
+++ b/editors/openoffice.org-2.0-devel/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
diff --git a/editors/openoffice.org-2.0/files/freebsd-local.sh b/editors/openoffice.org-2.0/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-2.0/files/freebsd-local.sh
+++ b/editors/openoffice.org-2.0/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
diff --git a/editors/openoffice.org-2/files/freebsd-local.sh b/editors/openoffice.org-2/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-2/files/freebsd-local.sh
+++ b/editors/openoffice.org-2/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
diff --git a/editors/openoffice.org-3-RC/files/freebsd-local.sh b/editors/openoffice.org-3-RC/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-3-RC/files/freebsd-local.sh
+++ b/editors/openoffice.org-3-RC/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
diff --git a/editors/openoffice.org-3-devel/files/freebsd-local.sh b/editors/openoffice.org-3-devel/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-3-devel/files/freebsd-local.sh
+++ b/editors/openoffice.org-3-devel/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
diff --git a/editors/openoffice.org-3/files/freebsd-local.sh b/editors/openoffice.org-3/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-3/files/freebsd-local.sh
+++ b/editors/openoffice.org-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
diff --git a/editors/openoffice.org-vcltesttool/files/freebsd-local.sh b/editors/openoffice.org-vcltesttool/files/freebsd-local.sh
index b2a0d769ee14..aef69e5cff61 100644
--- a/editors/openoffice.org-vcltesttool/files/freebsd-local.sh
+++ b/editors/openoffice.org-vcltesttool/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