瀏覽代碼

Fix fix to torrc cleanup; resolve bug 115

svn:r3944
Nick Mathewson 19 年之前
父節點
當前提交
3b6359737e
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      contrib/package_nsis.sh

+ 3 - 3
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