New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove CRLF from *.{html,css,sql,xml,js,properties,jspf,java,jsp} #924

Merged
merged 4 commits into from Nov 15, 2017

Conversation

Projects
None yet
3 participants
@akrherz
Member

akrherz commented Nov 14, 2017

all done via the magic of dos2unix

@akrherz

This comment has been minimized.

Show comment
Hide comment
@akrherz

akrherz Nov 14, 2017

Member

Files not hit by this

$ find . -not -type d -exec file "{}" ";" | grep CRLF
./build/installer/openfire.install4j: XML 1.0 document, ASCII text, with very long lines, with CRLF line terminators
./build/projects/Openfire.ipr: XML 1.0 document, ASCII text, with CRLF line terminators
./build/wildfireHome/embedded-db/wildfire.script: ASCII text, with very long lines, with CRLF line terminators
./src/bin/extra/embedded-db.rc: ASCII text, with CRLF line terminators
./src/bin/openfire-dev.bat: DOS batch file, ASCII text, with very long lines, with CRLF line terminators
./src/bin/openfire.bat: DOS batch file, ASCII text, with CRLF line terminators
./src/plugins/kraken/lib/patches/smack.sasl.patch: unified diff output, ASCII text, with CRLF, LF line terminators
./src/plugins/rayo/src/demo/confphone.mxml: XML 1.0 document, ASCII text, with CRLF line terminators
./src/plugins/rayo/src/demo/make_confphone.cmd: ASCII text, with CRLF line terminators
./src/plugins/inverse/classes/inverse/css/images/arrow.svg: ASCII text, with CRLF line terminators
./src/plugins/inverse/classes/inverse/css/images/bgbl.svg: HTML document, ASCII text, with CRLF line terminators
./src/plugins/inverse/classes/inverse/css/images/bgtr.svg: HTML document, ASCII text, with CRLF line terminators
./src/plugins/inverse/classes/inverse/css/images/dark-arrow.svg: ASCII text, with CRLF line terminators
./src/resources/jar/META-INF/mime.types: ASCII text, with CRLF line terminators
./src/test/throttletest/build/ThrottleTest.ipr: XML 1.0 document, ASCII text, with CRLF line terminators
./xmppserver/target/classes/META-INF/mime.types: ASCII text, with CRLF line terminators
Member

akrherz commented Nov 14, 2017

Files not hit by this

$ find . -not -type d -exec file "{}" ";" | grep CRLF
./build/installer/openfire.install4j: XML 1.0 document, ASCII text, with very long lines, with CRLF line terminators
./build/projects/Openfire.ipr: XML 1.0 document, ASCII text, with CRLF line terminators
./build/wildfireHome/embedded-db/wildfire.script: ASCII text, with very long lines, with CRLF line terminators
./src/bin/extra/embedded-db.rc: ASCII text, with CRLF line terminators
./src/bin/openfire-dev.bat: DOS batch file, ASCII text, with very long lines, with CRLF line terminators
./src/bin/openfire.bat: DOS batch file, ASCII text, with CRLF line terminators
./src/plugins/kraken/lib/patches/smack.sasl.patch: unified diff output, ASCII text, with CRLF, LF line terminators
./src/plugins/rayo/src/demo/confphone.mxml: XML 1.0 document, ASCII text, with CRLF line terminators
./src/plugins/rayo/src/demo/make_confphone.cmd: ASCII text, with CRLF line terminators
./src/plugins/inverse/classes/inverse/css/images/arrow.svg: ASCII text, with CRLF line terminators
./src/plugins/inverse/classes/inverse/css/images/bgbl.svg: HTML document, ASCII text, with CRLF line terminators
./src/plugins/inverse/classes/inverse/css/images/bgtr.svg: HTML document, ASCII text, with CRLF line terminators
./src/plugins/inverse/classes/inverse/css/images/dark-arrow.svg: ASCII text, with CRLF line terminators
./src/resources/jar/META-INF/mime.types: ASCII text, with CRLF line terminators
./src/test/throttletest/build/ThrottleTest.ipr: XML 1.0 document, ASCII text, with CRLF line terminators
./xmppserver/target/classes/META-INF/mime.types: ASCII text, with CRLF line terminators

@dwd dwd self-requested a review Nov 14, 2017

@dwd

dwd approved these changes Nov 14, 2017

Checked with ?w=1 that these are exclusively whitespace changes.

@akrherz

This comment has been minimized.

Show comment
Hide comment
@akrherz

akrherz Nov 14, 2017

Member

OK, gonna piggyback now a change to replace all tabs in those same files with four spaces

Member

akrherz commented Nov 14, 2017

OK, gonna piggyback now a change to replace all tabs in those same files with four spaces

akrherz added some commits Nov 14, 2017

replace tabs with spaces, when tabs start the line
the command line form was
find . -name '*.jsp' ! -type d -exec bash -c 'expand -i -t 4 "$0" > /tmp/e && mv /tmp/e "$0"' {} \;
ensure all files end with line feed
command form this time was
git ls-files  '*.jsp' | while read f; do tail -n1 $f | read -r _ || echo >> $f; done
@akrherz

This comment has been minimized.

Show comment
Hide comment
@akrherz

akrherz Nov 14, 2017

Member

So the last commit should be the only code change. I assume it is necessary as the trailing line feed is now interpreted by the JSP compiler as the need to print an extra empty space?

Member

akrherz commented Nov 14, 2017

So the last commit should be the only code change. I assume it is necessary as the trailing line feed is now interpreted by the JSP compiler as the need to print an extra empty space?

@dwd

This comment has been minimized.

Show comment
Hide comment
@dwd

dwd Nov 14, 2017

Member

I'm confused - why would adding a line feed at the end cause the return statement to be unneeded? And what's the harm in leaving them in?

Member

dwd commented Nov 14, 2017

I'm confused - why would adding a line feed at the end cause the return statement to be unneeded? And what's the harm in leaving them in?

@dwd dwd merged commit 4e75524 into igniterealtime:master Nov 15, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@IgniteRealtime-Bot

This comment has been minimized.

Show comment
Hide comment
@IgniteRealtime-Bot

IgniteRealtime-Bot Nov 17, 2017

This pull request has been mentioned on Ignite Realtime Community Forums. There might be relevant details there:

https://discourse.igniterealtime.org/t/openfire-4-2-0-beta-release/79737/1

IgniteRealtime-Bot commented Nov 17, 2017

This pull request has been mentioned on Ignite Realtime Community Forums. There might be relevant details there:

https://discourse.igniterealtime.org/t/openfire-4-2-0-beta-release/79737/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment