[PC-BSD Commits] r4084 - pbibuild/modules/mail/thunderbird/overlay-dir
svn at pcbsd.org
svn at pcbsd.org
Wed Jun 10 11:24:04 PDT 2009
Author: kris
Date: 2009-06-10 11:24:04 -0700 (Wed, 10 Jun 2009)
New Revision: 4084
Modified:
pbibuild/modules/mail/thunderbird/overlay-dir/PBI.SetupScript.sh
Log:
Cleanup the thunderbird install script
Modified: pbibuild/modules/mail/thunderbird/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/mail/thunderbird/overlay-dir/PBI.SetupScript.sh 2009-06-10 18:21:13 UTC (rev 4083)
+++ pbibuild/modules/mail/thunderbird/overlay-dir/PBI.SetupScript.sh 2009-06-10 18:24:04 UTC (rev 4084)
@@ -36,6 +36,14 @@
HOMEDIR="/root"
fi
+if [ -e "${HOMEDIR}/.kde4" ]
+then
+ KDEDIR=".kde4"
+else
+ KDEDIR=".kde"
+fi
+
+
# Ask if we should make this the default email application for our user
kdialog --yesno "Do you want to make Thunderbird the default E-Mail application?" --title "Default mail application?"
if [ "$?" = "0" ]
@@ -46,8 +54,8 @@
[PROFILE_Default]
EmailClient=/usr/local/bin/thunderbird
ServerType=
-TerminalClient=false" > ${HOMEDIR}/.kde/share/config/emaildefaults
- chown ${USERNAME}:${USERNAME} ${HOMEDIR}/.kde/share/config/emaildefaults
+TerminalClient=false" > ${HOMEDIR}/${KDEDIR}/share/config/emaildefaults
+ chown ${USERNAME}:${USERNAME} ${HOMEDIR}/${KDEDIR}/share/config/emaildefaults
fi
else
@@ -58,16 +66,16 @@
do
USER="$i"
- if [ -d "${USER}/.kde/share/config" ]
+ if [ -d "${USER}/${KDEDIR}/share/config" ]
then
echo "[Defaults]
Profile=Default
[PROFILE_Default]
-EmailClient=/usr/local/bin/thunderbird
+EmailClient=/Programs/bin/thunderbird
ServerType=
-TerminalClient=false" > ${USER}/.kde/share/config/emaildefaults
- chown ${USER}:${USER} ${USER}/.kde/share/config/emaildefaults
+TerminalClient=false" > ${USER}/${KDEDIR}/share/config/emaildefaults
+ chown ${USER}:${USER} ${USER}/${KDEDIR}/share/config/emaildefaults
fi
@@ -76,4 +84,4 @@
fi
-echo "LAUNCHCLOSE: /usr/local/bin/thunderbird"
+echo "LAUNCHCLOSE: /Programs/bin/thunderbird"
More information about the Commits
mailing list