Revision: 2048
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2048&view=rev
Author:   tmzullinger
Date:     2008-07-14 16:06:53 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
Fix bashisms in several scripts

Use /bin/bash for sync-evolution.sh and sync-ldif.sh since they use
bash-specific syntax.

Remove bash-specific syntax in the sync-thunderbird-nano.sh script.

Thanks to Frank Lichtenheld (fixes Debian bug #489605).

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog
    gtkpod/trunk/scripts/sync-evolution.sh
    gtkpod/trunk/scripts/sync-ldif.sh
    gtkpod/trunk/scripts/sync-thunderbird-nano.sh

Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog      2008-07-10 16:28:00 UTC (rev 2047)
+++ gtkpod/trunk/ChangeLog      2008-07-14 23:06:53 UTC (rev 2048)
@@ -1,3 +1,13 @@
+2008-07-14  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+       * scripts/sync-evolution.sh
+         scripts/sync-ldif.sh: Use /bin/bash as the interpreter, as
+         these scripts use bash-specific syntax
+
+       * scripts/sync-thunderbird-nano.sh: Remove a few bashisms
+
+         Thanks to Frank Lichtenheld (fixes Debian bug #489605)
+
 2008-07-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
        * src/syncdir.c: hash filenames of tracks to reduce overhead

Modified: gtkpod/trunk/scripts/sync-evolution.sh
===================================================================
--- gtkpod/trunk/scripts/sync-evolution.sh      2008-07-10 16:28:00 UTC (rev 
2047)
+++ gtkpod/trunk/scripts/sync-evolution.sh      2008-07-14 23:06:53 UTC (rev 
2048)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Script for syncing evolution addressbook data with iPod
 # (c) 2004 Clinton Gormley <clint at traveljury dot com>
 #

Modified: gtkpod/trunk/scripts/sync-ldif.sh
===================================================================
--- gtkpod/trunk/scripts/sync-ldif.sh   2008-07-10 16:28:00 UTC (rev 2047)
+++ gtkpod/trunk/scripts/sync-ldif.sh   2008-07-14 23:06:53 UTC (rev 2048)
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # Placed under GPL; to know more, see:
 #                      http://www.gnu.org/licenses/licenses.html

Modified: gtkpod/trunk/scripts/sync-thunderbird-nano.sh
===================================================================
--- gtkpod/trunk/scripts/sync-thunderbird-nano.sh       2008-07-10 16:28:00 UTC 
(rev 2047)
+++ gtkpod/trunk/scripts/sync-thunderbird-nano.sh       2008-07-14 23:06:53 UTC 
(rev 2048)
@@ -29,7 +29,7 @@
 ENCODING=ISO-8859-15         # encoding used by ipod
 NAME=thunderbird             # default file export name
 FILE_FLAG=''                # flag used to determine end of file
-let COUNT=0;                # file counter
+COUNT=0                             # file counter
 
 # Unless called with "-e=none" this script requires "recode" available
 # from ftp://ftp.iro.umontreal.ca/pub/recode/recode-3.6.tar.gz
@@ -80,7 +80,7 @@
 for line in $(cat $IPOD_MOUNT/Contacts/${NAME}.vcf | sed "s/\ /[54321]/g")
 do
        if [ "$FILE_FLAG" = 'END' ]; then
-               let COUNT=$COUNT+1;
+               COUNT=$((COUNT+1));
        fi
 
        echo $line | sed "s/\[54321\]/\ /g" >> 
$IPOD_MOUNT/Contacts/${NAME}$COUNT.vcf


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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to