diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:33 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:33 +0900 |
| commit | dd5b7dc8ed2d02a693411aaae98f97d42c7a536c (patch) | |
| tree | 68370f25ca41e7f913ef5a1a341431f99ffafa56 | |
| parent | Merge branch 'ds/trace2-document-env-vars' (diff) | |
| parent | check-non-portable-shell: support Perl versions older than 5.10 (diff) | |
| download | tgif-dd5b7dc8ed2d02a693411aaae98f97d42c7a536c.tar.xz | |
Merge branch 'es/check-non-portable-pre-5.10'
Developer support update.
* es/check-non-portable-pre-5.10:
check-non-portable-shell: support Perl versions older than 5.10
| -rwxr-xr-x | t/check-non-portable-shell.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/t/check-non-portable-shell.pl b/t/check-non-portable-shell.pl index 166d64d4a2..38bfeebd88 100755 --- a/t/check-non-portable-shell.pl +++ b/t/check-non-portable-shell.pl @@ -27,14 +27,14 @@ for my $i (@ARGV) { close $f; } +my $line = ''; while (<>) { chomp; + $line .= $_; # stitch together incomplete lines (those ending with "\") - while (s/\\$//) { - $_ .= readline; - chomp; - } + next if $line =~ s/\\$//; + $_ = $line; /\bcp\s+-a/ and err 'cp -a is not portable'; /\bsed\s+-[^efn]\s+/ and err 'sed option not portable (use only -n, -e, -f)'; /\becho\s+-[neE]/ and err 'echo with option is not portable (use printf)'; @@ -48,6 +48,7 @@ while (<>) { /\bexport\s+[A-Za-z0-9_]*=/ and err '"export FOO=bar" is not portable (use FOO=bar && export FOO)'; /^\s*([A-Z0-9_]+=(\w+|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and err '"FOO=bar shell_func" assignment extends beyond "shell_func"'; + $line = ''; # this resets our $. for each file close ARGV if eof; } |