From: swa <swa@users.sourceforge.net>
Date: Thu, 24 May 2001 07:35:07 +0000 (+0000)
Subject: removed ^M in order to test cvs.
X-Git-Tag: v_2_9_9~503
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=f5c64e77d2a689391df489fc920e469d7da69872

removed ^M in order to test cvs.
---

diff --git a/junkbuster.monthly b/junkbuster.monthly
index 44ff3496..8f88870c 100644
--- a/junkbuster.monthly
+++ b/junkbuster.monthly
@@ -1,44 +1,45 @@
-#!/bin/sh
-
-# $Id: junkbuster.monthly,v 1.1 2001/04/16 21:10:38 rodney 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
+#!/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
+