Author: adam-guest
Date: 2008-03-03 21:10:03 +0000 (Mon, 03 Mar 2008)
New Revision: 1096

Modified:
   trunk/debian/changelog
   trunk/scripts/checkbashisms.pl
Log:
  + Modify each of the simple shell variable tests (e.g. $RANDOM) to
    also match ${variable}

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-03-03 21:00:00 UTC (rev 1095)
+++ trunk/debian/changelog      2008-03-03 21:10:03 UTC (rev 1096)
@@ -14,6 +14,8 @@
       disown, builtin, set -[BHT], alias -p, unalias -a, local with
       options or an assigned value and $BASH(_*). Thanks to Raphael
       Geissert for the patch (Closes: #469050)
+    + Modify each of the simple shell variable tests (e.g. $RANDOM) to
+      also match ${variable}
 
  -- Adam D. Barratt <[EMAIL PROTECTED]>  Sat, 01 Mar 2008 11:42:02 +0000
 

Modified: trunk/scripts/checkbashisms.pl
===================================================================
--- trunk/scripts/checkbashisms.pl      2008-03-03 21:00:00 UTC (rev 1095)
+++ trunk/scripts/checkbashisms.pl      2008-03-03 21:10:03 UTC (rev 1096)
@@ -166,13 +166,13 @@
                '\$\{\w+(/.+?){1,2}\}' =>      q<${parm/?/pat[/str]}>,
                '[EMAIL PROTECTED]' => q<bash arrays, ${name[0|*|@]}>,
                '(\$\(|\`)\s*\<\s*\S+\s*(\)|\`)' => q<'$(\< foo)' should be 
'$(cat foo)'>,
-               '\$RANDOM\b' =>                q<$RANDOM>,
-               '\$(OS|MACH)TYPE\b'         => q<$(OS|MACH)TYPE>,
-               '\$HOST(TYPE|NAME)\b'       => q<$HOST(TYPE|NAME)>,
-               '\$DIRSTACK\b'              => q<$DIRSTACK>,
-               '\$EUID\b'                  => q<$EUID should be "id -u">,
-               '\$SECONDS\b'               => q<$SECONDS>,
-               '\$BASH(_[A-Z]+)?\b'        => q<$BASH(_SOMETHING)>,
+               '\$\{?RANDOM\}?\b' =>          q<$RANDOM>,
+               '\$\{?(OS|MACH)TYPE\}?\b'   => q<$(OS|MACH)TYPE>,
+               '\$\{?HOST(TYPE|NAME)\}?\b' => q<$HOST(TYPE|NAME)>,
+               '\$\{?DIRSTACK\}?\b'        => q<$DIRSTACK>,
+               '\$\{?EUID\}?\b'            => q<$EUID should be "id -u">,
+               '\$\{?SECONDS\}?\b'         => q<$SECONDS>,
+               '\$\{?BASH(_[A-Z]+)?\}?\b'   => q<$BASH(_SOMETHING)>,
            );
 
            if ($opt_echo) {



-- 
To unsubscribe, send mail to [EMAIL PROTECTED]

Reply via email to