Revision: 1630
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1630&view=rev
Author: tmzullinger
Date: 2007-07-10 22:15:14 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
try harder to find evolution-addressbook-export (thanks to G?\195?\182tz Waschk)
Modified Paths:
--------------
gtkpod/trunk/ChangeLog_detailed
gtkpod/trunk/scripts/sync-evolution.sh
Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed 2007-07-08 22:04:19 UTC (rev 1629)
+++ gtkpod/trunk/ChangeLog_detailed 2007-07-11 05:15:14 UTC (rev 1630)
@@ -1,3 +1,9 @@
+2007-07-11 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * scripts/sync-evolution.sh:
+ try harder to find evolution-addressbook-export (thanks to
+ Götz Waschk)
+
2007-07-05 Todd Zullinger <tmzullinger at users.sourceforge.net>
* src/autodection.c:
Modified: gtkpod/trunk/scripts/sync-evolution.sh
===================================================================
--- gtkpod/trunk/scripts/sync-evolution.sh 2007-07-08 22:04:19 UTC (rev
1629)
+++ gtkpod/trunk/scripts/sync-evolution.sh 2007-07-11 05:15:14 UTC (rev
1630)
@@ -14,9 +14,16 @@
# with the following defaults:
IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
-EVOPATH='/opt/gnome/libexec/evolution/2.0:/usr/lib/evolution/2.0:/opt/gnome/bin'
# additional path
ENCODING=ISO-8859-15 # encoding used by ipod
+# try to find the path to evolution-addressbook-export
+for i in
{/opt/gnome,/usr,/usr/local}/{bin,lib*}/{,evolution/*/}evolution-addressbook-export;
do
+ if [ -x "$i" ]; then
+ EVOPATH=`dirname "$i"`
+ break
+ fi
+done
+
# Unless called with "-e=none" this script requires "iconv" available
# from http://www.gnu.org/software/libiconv/
@@ -80,10 +87,10 @@
evolution-addressbook-export --help >/dev/null 2>&1
if [ ! $? == 0 ]; then
- echo "** Error: Couldn't find evolution-addressbook-export in your
PATH:"
- echo $PATH
- echo ""
- echo "Please specify \"-d <path to evolution-addressbook-export>\" when
you call this script"
+ echo "** Error: Couldn't find evolution-addressbook-export in your PATH:"
+ echo $PATH
+ echo ""
+ echo "Please specify \"-d <path to evolution-addressbook-export>\" when
you call this script"
exit 1
fi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
