[PC-BSD Commits] r4130 - in pbibuild/modules/office: . openoffice3-de/overlay-dir openoffice3-en/overlay-dir openoffice3-es/overlay-dir openoffice3-et/overlay-dir openoffice3-fr/overlay-dir openoffice3-it/overlay-dir openoffice3-ja openoffice3-ja/overlay-dir openoffice3-pt/overlay-dir openoffice3-pt-BR/overlay-dir openoffice3-uk/overlay-dir openoffice3-zh-TW/overlay-dir
svn at pcbsd.org
svn at pcbsd.org
Mon Jun 22 11:13:28 PDT 2009
Author: kris
Date: 2009-06-22 11:13:27 -0700 (Mon, 22 Jun 2009)
New Revision: 4130
Removed:
pbibuild/modules/office/openoffice3-zh-CH/
Modified:
pbibuild/modules/office/openoffice3-de/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-es/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-ja/copy-files
pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-ja/pbi.conf
pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.SetupScript.sh
Log:
Cleaned up the OO3 modules, and include fonts in JA version, since it needs them
Modified: pbibuild/modules/office/openoffice3-de/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-de/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-de/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -25,24 +25,3 @@
ln -s swriter soffice
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -24,25 +24,3 @@
ln -s open*swriter swriter
ln -s swriter soffice
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-es/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-es/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-es/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -24,25 +24,3 @@
ln -s open*swriter swriter
ln -s swriter soffice
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -23,26 +23,3 @@
ln -s open*spadmin spadmin
ln -s open*swriter swriter
ln -s swriter soffice
-
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -23,26 +23,3 @@
ln -s open*spadmin spadmin
ln -s open*swriter swriter
ln -s swriter soffice
-
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -23,26 +23,3 @@
ln -s open*spadmin spadmin
ln -s open*swriter swriter
ln -s swriter soffice
-
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-ja/copy-files
===================================================================
--- pbibuild/modules/office/openoffice3-ja/copy-files 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-ja/copy-files 2009-06-22 18:13:27 UTC (rev 4130)
@@ -12,3 +12,6 @@
/usr/local/bin/classpath bin/
/usr/local/etc/java* etc/
/usr/local/share/java* share/
+/usr/local/lib/libfont* autolibs/
+/usr/local/lib/X11 autolibs/
+/usr/local/etc/fonts etc/
Modified: pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -23,26 +23,3 @@
ln -s open*spadmin spadmin
ln -s open*swriter swriter
ln -s swriter soffice
-
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-ja/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-ja/pbi.conf 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-ja/pbi.conf 2009-06-22 18:13:27 UTC (rev 4130)
@@ -39,7 +39,7 @@
# Build Key - Change this to anything else to trigger a rebuild
# - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
# Set this to YES to mark a port / module as broken
#PORTBROKE="YES" ; export PORTBROKE
Modified: pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -24,25 +24,3 @@
ln -s open*swriter swriter
ln -s swriter soffice
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -24,25 +24,3 @@
ln -s open*swriter swriter
ln -s swriter soffice
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -24,25 +24,3 @@
ln -s open*swriter swriter
ln -s swriter soffice
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
Modified: pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.RemoveScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.RemoveScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -6,21 +6,3 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
- cd /home
- for i in `ls`
- do
- if [ -e "/home/${i}/.openoffice.org3" ]
- then
- rm -rf /home/${i}/.openoffice.org3
- fi
- done
- fi
-fi
-
Modified: pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.SetupScript.sh 2009-06-22 17:28:08 UTC (rev 4129)
+++ pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.SetupScript.sh 2009-06-22 18:13:27 UTC (rev 4130)
@@ -23,26 +23,3 @@
ln -s open*spadmin spadmin
ln -s open*swriter swriter
ln -s swriter soffice
-
-
-# Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
-cd /home
-for i in `ls`
-do
-
- if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
- then
- mkdir -p ${i}/.openoffice.org/3/user
- cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
- chown -R ${i}:${i} ${i}/.openoffice.org
- else
- cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
- cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
- if [ "$?" != "0" ]
- then
- echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
- fi
- chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
- fi
-done
-
More information about the Commits
mailing list