From 48251be9125f8e23df180126d50422b0e6561030 Mon Sep 17 00:00:00 2001
From: Nathan Gass
Date: Wed, 17 Jul 2013 10:21:36 +0000
Subject: add --opts variant to shell_command which adds dashes for posix
 options, add tests for -opts and --opts

---
 it.class | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'it.class')

diff --git a/it.class b/it.class
index 14cd8a2..0c6d4a6 100644
--- a/it.class
+++ b/it.class
@@ -550,15 +550,17 @@ static function shell_command(/* $cmd, $values1 = array(), ... */)
 	#for escapeshellarg in it::_exec_quotevalue
 	$oldlocale = setlocale(LC_CTYPE, 0);
 	setlocale(LC_CTYPE, 'de_CH');
-	foreach (it::match('({(-?)([a-z0-9]\w*)})', $cmd, array('all' => true)) as $tags)
+	foreach (it::match('({(-?-?)([a-z0-9]\w*)})', $cmd, array('all' => true)) as $tags)
 	{
 		list($tag, $option, $key) = $tags;
 		$parts = array();
 
 		if ($option)
 		{
-			foreach ((array)$values["-$key"] as $key => $value)
+			foreach ((array)$values[$option . $key] as $key => $value)
 			{
+				if ($option == '--')
+					$key = ($key[1] ? '--' : '-') . $key;
 				if ($value === true || $value === false || $value === null)
 					$parts[] = $value ? $key : "";
 				else foreach ((array)$value as $val)
-- 
cgit v1.2.3