[or-cvs] Fix fix to torrc cleanup; resolve bug 115

[Nick Mathewson]

Update of /home/or/cvsroot/tor/contrib
In directory moria.mit.edu:/tmp/cvs-serv26216/contrib

Modified Files:
	package_nsis.sh 
Log Message:
Fix fix to torrc cleanup; resolve bug 115

Index: package_nsis.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/package_nsis.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- package_nsis.sh	31 Mar 2005 07:05:29 -0000	1.6
+++ package_nsis.sh	1 Apr 2005 06:51:12 -0000	1.7
@@ -24,14 +24,14 @@
 man2html doc/tor-resolve.1 > win_tmp/tmp/tor-resolve.html
 
 clean_newlines() {
-    perl -pe 'BEGIN {undef $/;} s/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg;' $1 >$2
+    perl -pe 's/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg;' $1 >$2
 }
 
 clean_localstatedir() {
-    perl -pe 'BEGIN {undef $/;} s/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg; s{\@LOCALSTATEDIR\@/(lib|log)/tor/}{C:\\Documents and Settings\\Application Data\\Tor\\}' $1 >$2
+    perl -pe 's/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg; s{\@LOCALSTATEDIR\@/(lib|log)/tor/}{C:\\Documents and Settings\\Application Data\\Tor\\}' $1 >$2
 }
 
-for fn in CLIENTS tor-spec.txt HACKING rend-spec.txt control-spec.txt \
+For fn in CLIENTS tor-spec.txt HACKING rend-spec.txt control-spec.txt \
    tor-doc.html tor-doc.css version-spec.txt; do
     clean_newlines doc/$fn win_tmp/doc/$fn
 done