Fix #1775 tbg config newline check #1777
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…n` after `\r` as whitespace instead of being part of the newline.
ax3l
approved these changes
Jan 23, 2017
ax3l
added
bug
psychocoderHPC
requested changes
Jan 23, 2017
| @@ -374,12 +374,29 @@ if [ ! -f "$cfg_file" ] ; then | |||
| fi | |||
|
|
|||
| # cfg file sanity check - space after \ at EOL ? | |||
| cfg_err=`egrep "\\\\\[[:space:]]+$" $cfg_file | wc -l` | |||
| cfg_err=`egrep "\\\\\[[:blank:]]+$" $cfg_file | wc -l` | |||
| if [ $cfg_err != 0 ] ; then | |||
| echo "ERROR: file \"$cfg_file\" contains spaces after line continuation \\" | |||
| echo "Check the following lines for end-of-line spaces:" | |||
| echo "" | |||
| egrep -n "\\\[[:space:]]+$" $cfg_file | |||
There was a problem hiding this comment.
:space: should be :blank:
There was a problem hiding this comment.
is there a reason it is once 5x and an other time 3x \? Afaik, -n does not change the syntax of egrep, does it?
There was a problem hiding this comment.
I have no idea, I am just the pattern matching boy. I see stuff and replace it with other stuff. I am not paid to think about the stuff! 😜
ax3l
changed the title
ax3l
changed the title
ax3l
changed the title
psychocoderHPC
approved these changes
Jan 24, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the check for end lines allowing windows new lines (Issue #1775)
Furthermore as tbg does only support unix new lines, the config files are check for this trait.