[SCM] Git repository for devscripts branch, master, updated. v2.12.4-47-g1b29202

Benjamin Drung bdrung at debian.org
Thu Oct 25 21:30:11 UTC 2012


The following commit has been merged in the master branch:
commit 1b292022be0ea50ea17bc6f2ad56d00fcd1beac3
Author: Raphael Geissert <geissert at debian.org>
Date:   Tue Oct 23 12:36:36 2012 -0500

    checkbashisms: improve check for non-alnum function names
    
    Function names with certain characters and those with the 'function'
    reserved word but without the parenthesis were not matched by the old
    regex.
    
    Signed-off-by: Benjamin Drung <bdrung at debian.org>

diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
index 6bac879..5cf9152 100755
--- a/scripts/checkbashisms.pl
+++ b/scripts/checkbashisms.pl
@@ -604,7 +604,7 @@ sub init_hashes {
 	$LEADIN . qr'alias\s+-p' =>       q<alias -p>,
 	$LEADIN . qr'unalias\s+-a' =>     q<unalias -a>,
 	$LEADIN . qr'local\s+-[a-zA-Z]+' => q<local -opt>,
-	qr'(?:^|\s+)\s*\(?\w*[^\(\w\s]+\S*?\s*\(\)\s*([\{|\(]|\Z)'
+	qr'(?:^|\s)(?<func>function\s)?\s*(?:[^<>\(\)\[\]\{\};|\s]*[^<>\(\)\[\]\{\};|\s\w][^<>\(\)\[\]\{\};|\s]*)\s*(?(<func>)(?:\(\s*\))?|\(\s*\))\s*([\{|\(]|\Z)'
 		=> q<function names should only contain [a-z0-9_]>,
 	$LEADIN . qr'(push|pop)d(\s|\Z)' =>    q<(push|pop)d>,
 	$LEADIN . qr'export\s+-[^p]' =>  q<export only takes -p as an option>,

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list