commit 28a77346f660acde1130907a4ca6f5eaa8d21dd4
parent 7930aa0c548776073af23f0012fc824a1bd8e6a1
Author: Paul Mangan <paul@claws-mail.org>
Date: Fri, 24 Oct 2008 08:06:25 +0000
2008-10-24 [paul] 3.6.1cvs10
* tools/kdeservicemenu/README
* tools/kdeservicemenu/install.sh
add support for kde4 in addition to kde3.
a rework involving checking for kde4-config, then
kde-config, finally prompting the user for the
location of either if they cannot be found
Diffstat:
5 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-24 [paul] 3.6.1cvs10
+
+ * tools/kdeservicemenu/README
+ * tools/kdeservicemenu/install.sh
+ add support for kde4 in addition to kde3.
+ a rework involving checking for kde4-config, then
+ kde-config, finally prompting the user for the
+ location of either if they cannot be found
+
+
2008-10-18 [paul] 3.6.1cvs9
* tools/claws.i18n.status.pl
diff --git a/PATCHSETS b/PATCHSETS
@@ -3591,3 +3591,4 @@
( cvs diff -u -r 1.29.2.11 -r 1.29.2.12 INSTALL; ) > 3.6.1cvs7.patchset
( cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/plugins/pgpcore/sgpgme.c; ) > 3.6.1cvs8.patchset
( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 tools/claws.i18n.status.pl; ) > 3.6.1cvs9.patchset
+( cvs diff -u -r 1.2.2.12 -r 1.2.2.13 tools/kdeservicemenu/README; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 tools/kdeservicemenu/install.sh; ) > 3.6.1cvs10.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/tools/kdeservicemenu/README b/tools/kdeservicemenu/README
@@ -1,5 +1,5 @@
claws-mail-kdeservicemenu.pl
-Version: 1.5
+Version: 1.6
Claws Mail servicemenu for Konqueror
FILES
diff --git a/tools/kdeservicemenu/install.sh b/tools/kdeservicemenu/install.sh
@@ -6,18 +6,23 @@ DESKTOP="claws-mail-attach-files.desktop"
SERVICEMENU_DIR="share/apps/konqueror/servicemenus"
function check_environ {
-echo "Checking for kde-config..."
-if [ -z "$(type 'kde-config' 2> /dev/null)" ]; then
- echo "kde-config not found, checking for \$KDEDIR to compensate..."
- if [ ! -z $KDEDIR ]; then
- export PATH=$PATH:$KDEDIR/bin
+echo "Checking for kde4-config..."
+if [ ! -z "$(type 'kde4-config' 2> /dev/null)" ]; then
+ echo "Found kde4-config..."
+ KDECONFIG="kde4-config"
+else
+ echo "kde4-config not found..."
+ echo "Checking for kde-config..."
+ if [ ! -z "$(type 'kde-config' 2> /dev/null)" ]; then
+ echo "Found kde-config..."
+ KDECONFIG="kde-config"
else
- KDEDIR=$(kdialog --title "Where is KDE installed?" --getexistingdirectory / )
- test -z $KDEDIR && exit 1
- export PATH=$PATH:$KDEDIR/bin
+ echo "kde-config not found..."
+ echo "asking user to find kde4-config or kde-config..."
+ KDECONFIG=$(kdialog --title "Locate kde-config or kde4-config" --getopenfilename / )
+ test -z $KDECONFIG && exit 1
fi
fi
-echo "OK"
}
function install_all {
@@ -26,6 +31,11 @@ SED_PREFIX=${PREFIX//\//\\\/}
sed "s/SCRIPT_PATH/$SED_PREFIX\\/bin\\/$PERL_SCRIPT/" $DESKTOP_TEMPLATE > $DESKTOP
echo "Installing $PREFIX/$SERVICEMENU_DIR/$DESKTOP"
mv -f $DESKTOP $PREFIX/$SERVICEMENU_DIR/$DESKTOP
+if [[ $? -ne 0 ]]
+then
+ kdialog --error "Could not complete installation."
+ exit
+fi
echo "Installing $PREFIX/bin/$PERL_SCRIPT"
cp -f $PERL_SCRIPT $PREFIX/bin/
echo "Setting permissions ..."
@@ -38,6 +48,11 @@ kdialog --msgbox "Finished installation."
function uninstall_all {
echo "Removing $PREFIX/$SERVICEMENU_DIR/$DESKTOP"
rm $PREFIX/$SERVICEMENU_DIR/$DESKTOP
+if [[ $? -ne 0 ]]
+then
+ kdialog --error "Could not complete uninstall."
+ exit
+fi
echo "Removing $PREFIX/bin/$PERL_SCRIPT"
rm $PREFIX/bin/$PERL_SCRIPT
echo "Finished uninstall."
@@ -67,8 +82,8 @@ fi
case $option in
"--global" )
check_environ
- PREFIX=$(kde-config --prefix)
- echo "Installing in $PREFIX ..."
+ PREFIX=$($KDECONFIG --prefix)
+ echo "Installing in $PREFIX/$SERVICEMENU_DIR ..."
if [ "$(id -u)" != "0" ]; then
exec kdesu "$0 --global"
fi
@@ -76,8 +91,8 @@ case $option in
;;
"--local" )
check_environ
- PREFIX=$(kde-config --localprefix)
- echo "Installing in $PREFIX ..."
+ PREFIX=$($KDECONFIG --localprefix)
+ echo "Installing in $PREFIX$SERVICEMENU_DIR ..."
if [ ! -d $PREFIX/bin ]; then
mkdir $PREFIX/bin
fi
@@ -88,8 +103,8 @@ case $option in
;;
"--uninstall-global" )
check_environ
- PREFIX=$(kde-config --prefix)
- echo "Uninstalling in $PREFIX ..."
+ PREFIX=$($KDECONFIG --prefix)
+ echo "Uninstalling from $PREFIX/$SERVICEMENU_DIR ..."
if [ "$(id -u)" != "0" ]; then
exec kdesu "$0 --uninstall-global"
fi
@@ -97,8 +112,8 @@ case $option in
;;
"--uninstall-local" )
check_environ
- PREFIX=$(kde-config --localprefix)
- echo "Uninstalling in $PREFIX ..."
+ PREFIX=$($KDECONFIG --localprefix)
+ echo "Uninstalling from $PREFIX$SERVICEMENU_DIR ..."
uninstall_all
;;
"-h" )
