aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-01-31 21:50:10 +0000
committerNils Adermann <naderman@naderman.de>2010-01-31 21:50:10 +0000
commit926d0f980ee2e064a2778da3fdca7b6be2e95e3d (patch)
tree1d98f9c7d44e255942a1d5fd49baf99d002f6be5
parentedd57359c8bfbc3ccd0f05a83b88d23da078d109 (diff)
downloadforums-926d0f980ee2e064a2778da3fdca7b6be2e95e3d.tar
forums-926d0f980ee2e064a2778da3fdca7b6be2e95e3d.tar.gz
forums-926d0f980ee2e064a2778da3fdca7b6be2e95e3d.tar.bz2
forums-926d0f980ee2e064a2778da3fdca7b6be2e95e3d.tar.xz
forums-926d0f980ee2e064a2778da3fdca7b6be2e95e3d.zip
fix_files script must have been broken by svn:eol-style quite a while ago, now uses tr rather than sed to replace carriage returns
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10464 89ea8834-ac86-4346-8a33-228a782c2dd0
-rwxr-xr-xphpBB/develop/fix_files.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/develop/fix_files.sh b/phpBB/develop/fix_files.sh
index 782418f504..d2207289dc 100755
--- a/phpBB/develop/fix_files.sh
+++ b/phpBB/develop/fix_files.sh
@@ -21,9 +21,9 @@ rm FILELIST.$$
for i in $(cat FILELIST); do
if [ -f $i ]; then
- sed -e s/
-//g $i > $i.tmp
- mv $i.tmp $i
+ cat $i | tr -d '\r' > $i.tmp
+ mv $i.tmp $i
fi
done
rm FILELIST
+