removed ^M in order to test cvs.

[privoxy.git] / junkbuster.monthly

diff --git a/junkbuster.monthly b/junkbuster.monthly
index 44ff349..8f88870 100644 (file)
--- a/junkbuster.monthly
+++ b/junkbuster.monthly
@@ -1,44 +1,45 @@
-#!/bin/sh\r
-\r
-# $Id: junkbuster.monthly,v 1.1 2001/04/16 21:10:38 rodney Exp $\r
-#\r
-# bug fixed, which downloaded all three files to the file blocklist\r
-#\r
-# Revised: Mon Dec 06 10:46:08 PST 1999 by Jon Hamkins\r
-# Hints by Ulrik Haugen <qha@lysator.liu.se>\r
-# Hints by mirjamv@theochem.kun.nl\r
-#\r
-set -e\r
-\r
-# blocklist\r
-wget -q --output-document=/etc/junkbuster/blocklist.new \\r
-     http://www.waldherr.org/blocklist\r
-\r
-mv -f /etc/junkbuster/blocklist.new /etc/junkbuster/blocklist\r
-\r
-if [ -f /etc/junkbuster/blocklist.local ] ; then\r
-   cat /etc/junkbuster/blocklist.local >> /etc/junkbuster/blocklist\r
-fi\r
-chmod 644 /etc/junkbuster/blocklist\r
-\r
-# cookiefile\r
-wget -q --output-document=/etc/junkbuster/cookiefile.new \\r
-     http://www.waldherr.org/cookiefile\r
-\r
-mv -f /etc/junkbuster/cookiefile.new /etc/junkbuster/cookiefile\r
-\r
-if [ -f /etc/junkbuster/cookiefile.local ] ; then\r
-   cat /etc/junkbuster/cookiefile.local >> /etc/junkbuster/cookiefile\r
-fi\r
-chmod 644 /etc/junkbuster/cookiefile\r
-\r
-# imagelist\r
-wget -q --output-document=/etc/junkbuster/imagelist.new \\r
-     http://www.waldherr.org/imagelist\r
-\r
-mv -f /etc/junkbuster/imagelist.new /etc/junkbuster/imagelist\r
-\r
-if [ -f /etc/junkbuster/imagelist.local ] ; then\r
-   cat /etc/junkbuster/imagelist.local >> /etc/junkbuster/imagelist\r
-fi\r
-chmod 644 /etc/junkbuster/imagelist\r
+#!/bin/sh
+
+# $Id: junkbuster.monthly,v 1.1.1.1 2001/05/15 13:58:57 oes Exp $
+#
+# bug fixed, which downloaded all three files to the file blocklist
+#
+# Revised: Mon Dec 06 10:46:08 PST 1999 by Jon Hamkins
+# Hints by Ulrik Haugen <qha@lysator.liu.se>
+# Hints by mirjamv@theochem.kun.nl
+#
+set -e
+
+# blocklist
+wget -q --output-document=/etc/junkbuster/blocklist.new \
+     http://www.waldherr.org/blocklist
+
+mv -f /etc/junkbuster/blocklist.new /etc/junkbuster/blocklist
+
+if [ -f /etc/junkbuster/blocklist.local ] ; then
+   cat /etc/junkbuster/blocklist.local >> /etc/junkbuster/blocklist
+fi
+chmod 644 /etc/junkbuster/blocklist
+
+# cookiefile
+wget -q --output-document=/etc/junkbuster/cookiefile.new \
+     http://www.waldherr.org/cookiefile
+
+mv -f /etc/junkbuster/cookiefile.new /etc/junkbuster/cookiefile
+
+if [ -f /etc/junkbuster/cookiefile.local ] ; then
+   cat /etc/junkbuster/cookiefile.local >> /etc/junkbuster/cookiefile
+fi
+chmod 644 /etc/junkbuster/cookiefile
+
+# imagelist
+wget -q --output-document=/etc/junkbuster/imagelist.new \
+     http://www.waldherr.org/imagelist
+
+mv -f /etc/junkbuster/imagelist.new /etc/junkbuster/imagelist
+
+if [ -f /etc/junkbuster/imagelist.local ] ; then
+   cat /etc/junkbuster/imagelist.local >> /etc/junkbuster/imagelist
+fi
+chmod 644 /etc/junkbuster/imagelist
+