- Change -x to -i (include) so that -r can become recursive

diff --git a/ext/phar/phar.php b/ext/phar/phar.php
index 6fb0478c02accb918ff9dfa1c0da9600818ea3da..05ec12e59f32e323f1b9aa23fb3790a929b41305 100644 (file)
--- a/ext/phar/phar.php
+++ b/ext/phar/phar.php
@@ -434,7 +434,7 @@ class PharCommand extends CLICommand
                        'f' => array('typ'=>'pharnew', 'val'=>NULL,      'required'=>1, 'inf'=>'<file>   Specifies the phar file to work on.'),
                        'a' => array('typ'=>'alias',   'val'=>'newphar', 'required'=>1, 'inf'=>'<alias>  Provide an alias name for the phar file.'),
                        's' => array('typ'=>'file',    'val'=>NULL,                     'inf'=>'<stub>   Select the stub file (excluded from list of input files/dirs).'),
-                       'r' => array('typ'=>'regex',   'val'=>NULL,                     'inf'=>'<regex>  Specifies a regular expression for input files.'),
+                       'i' => array('typ'=>'regex',   'val'=>NULL,                     'inf'=>'<regex>  Specifies a regular expression for input files.'),
                        'x' => array('typ'=>'regex',   'val'=>NULL,                     'inf'=>'<regex>  Regular expression for input files to exclude.'),
                        'c' => array('typ'=>'select',  'val'=>NULL,                     'inf'=>'<algo>   Compression algorithmus.', 'select'=>array('gz'=>'GZip compression','gzip'=>'GZip compression','bzip2'=>'BZip2 compression','bz'=>'BZip2 compression','bz2'=>'BZip2 compression','0'=>'No compression','none'=>'No compression')),
                        ''  => array('typ'=>'any',     'val'=>NULL,      'required'=>1, 'inf'=>'         Any number of input files and directories.'),
@@ -457,7 +457,7 @@ class PharCommand extends CLICommand
                $archive = $this->args['f']['val'];
                $alias   = $this->args['a']['val'];
                $stub    = $this->args['s']['val'];
-               $regex   = $this->args['r']['val'];
+               $regex   = $this->args['i']['val'];
                $invregex= $this->args['x']['val'];
                $input   = $this->args['']['val'];