summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-04-01 06:51:12 +0000
committerNick Mathewson <nickm@torproject.org>2005-04-01 06:51:12 +0000
commit3b6359737e97a499e84163d9b705fcb9f515fa1a (patch)
treec19f4d732be65d5e8e1a7bf1ce5d057e624bb790
parent2ff2db8d2acdd64d1cf28253d2d0aa412fd840bd (diff)
downloadtor-3b6359737e97a499e84163d9b705fcb9f515fa1a.tar.gz
tor-3b6359737e97a499e84163d9b705fcb9f515fa1a.zip
Fix fix to torrc cleanup; resolve bug 115
svn:r3944
-rw-r--r--contrib/package_nsis.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/package_nsis.sh b/contrib/package_nsis.sh
index fcc62fbbd1..9b2000784b 100644
--- a/contrib/package_nsis.sh
+++ b/contrib/package_nsis.sh
@@ -24,14 +24,14 @@ man2html doc/tor.1.in > win_tmp/tmp/tor-reference.html
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