From: Marcus Boerger <helly@php.net>
Date: Fri, 11 May 2007 17:19:06 +0000 (+0000)
Subject: - Change -x to -i (include) so that -r can become recursive
X-Git-Tag: RELEASE_1_2_0~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=daa47137a766edf6cf9a339e71025e1c66d00eae;p=php

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

diff --git a/ext/phar/phar.php b/ext/phar/phar.php
index 6fb0478c02..05ec12e59f 100644
--- 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'];