[Popcon-commits] cvs commit to popularity-contest/debian by ballombe

[popcon-commits@lists.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest/debian
In directory quantz:/tmp/cvs-serv20947/debian

Modified Files:
	changelog cron.weekly postrm 
Log Message:
Fix sh scripts to avoid non POSIX test options. (Closes: #231958).


Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- changelog	8 Feb 2004 12:49:37 -0000	1.49
+++ changelog	10 Feb 2004 11:36:46 -0000	1.50
@@ -4,6 +4,7 @@
     - Use dpkg --print-installation-architecture instead of $Config{archname}
       to report the platform.
     - Update server-side scripts to current popcon.debian.org version.
+    - Fix sh scripts to avoid non POSIX test options. (Closes: #231958).
 
  -- Petter Reinholdtsen <pere@debian.org>  Sun,  8 Feb 2004 13:47:38 +0100
 

Index: cron.weekly
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/cron.weekly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cron.weekly	25 Jan 2004 23:51:32 -0000	1.3
+++ cron.weekly	10 Feb 2004 11:36:46 -0000	1.4
@@ -18,7 +18,7 @@
 if [ -z "$MAILTO" ]; then exit 0; fi
 
 # don't run if PARTICIPATE is "no" or unset!
-[ "$PARTICIPATE" = "no" -o -z "$PARTICIPATE" ] && exit 0
+[ "$PARTICIPATE" = "no" ] || [ -z "$PARTICIPATE" ] && exit 0
 
 # keep old logs
 cd /var/log

Index: postrm
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postrm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- postrm	7 Sep 2003 17:27:27 -0000	1.1.1.1
+++ postrm	10 Feb 2004 11:36:46 -0000	1.2
@@ -5,7 +5,7 @@
         rm -f /etc/popularity-contest.conf
 fi
 
-if [ "$1" = "purge" -a -e /usr/share/debconf/confmodule ]; then
+if [ "$1" = "purge" ] && [ -e /usr/share/debconf/confmodule ]; then
     # Source debconf library.
     . /usr/share/debconf/confmodule
     # Remove my changes to the db.