Author: adam-guest
Date: 2008-07-06 20:43:32 +0000 (Sun, 06 Jul 2008)
New Revision: 1560
Modified:
trunk/debian/changelog
trunk/scripts/checkbashisms.pl
Log:
Fix a false positive in the checks for "dirs", "popd", "pushd", "shopt"
and "ulimit"
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-07-06 19:55:59 UTC (rev 1559)
+++ trunk/debian/changelog 2008-07-06 20:43:32 UTC (rev 1560)
@@ -4,6 +4,8 @@
+ Match the use of "shell echo -n" and "if foo then echo -n"
+ Fix a thinko in the quoted-block detection (thankfully the effects were
largely benign, unless one was attempting to check libtool...)
+ + Fix a false positive in the checks for "dirs", "popd", "pushd", "shopt"
+ and "ulimit"
* debchange: Also collapse UNRELEASED stanzas when -d is used
* debcheckout:
+ Improve git repository handling with --file
Modified: trunk/scripts/checkbashisms.pl
===================================================================
--- trunk/scripts/checkbashisms.pl 2008-07-06 19:55:59 UTC (rev 1559)
+++ trunk/scripts/checkbashisms.pl 2008-07-06 20:43:32 UTC (rev 1560)
@@ -454,13 +454,13 @@
$LEADIN . qr'local\s+\w+\s+\w+' => q<local x y>,
qr'(?:^|\s+)\s*\(?\w*[^\(\w\s]+\S*?\s*\(\)[^\"]?'
=> q<function names should only contain [a-z0-9_]>,
- $LEADIN . qr'(push|pop)d\b' => q<(push|pod)d>,
+ $LEADIN . qr'(push|pop)d(\s|\Z)' => q<(push|pod)d>,
$LEADIN . qr'export\s+-[^p]' => q<export only takes -p as an option>,
- $LEADIN . qr'ulimit\b' => q<ulimit>,
- $LEADIN . qr'shopt\b' => q<shopt>,
+ $LEADIN . qr'ulimit(\s|\Z)' => q<ulimit>,
+ $LEADIN . qr'shopt(\s|\Z)' => q<shopt>,
$LEADIN . qr'type\s' => q<type>,
$LEADIN . qr'time\s' => q<time>,
- $LEADIN . qr'dirs\b' => q<dirs>,
+ $LEADIN . qr'dirs(\s|\Z)' => q<dirs>,
qr'(?:^|\s+)[<>]\(.*?\)' => q<\<() process substituion>,
qr'(?:^|\s+)readonly\s+-[af]' => q<readonly -[af]>,
$LEADIN . qr'(sh|\$\{?SHELL\}?) -[rD]' => q<sh -[rD]>,
--
To unsubscribe, send mail to [EMAIL PROTECTED]
