xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support shell expansion in place of command name in command manager

Browse Source
This commit is contained in:
Maxime Coste 2012-02-15 14:19:57 +00:00
parent e9af61eb9f
commit 91f2292ec5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/command_manager.cc
View File

@ -156,7 +156,22 @@ void CommandManager::execute(const CommandParameters& params,
if (end != begin) if (end != begin)
{ {
std::vector<std::string> expanded_params;
auto command_it = m_commands.find(*begin); auto command_it = m_commands.find(*begin);
if (command_it == m_commands.end() and
begin->front() == '`' and begin->back() == '`')
{
shell_eval(expanded_params,
begin->substr(1, begin->length() - 2),
context);
if (not expanded_params.empty())
{
command_it = m_commands.find(expanded_params[0]);
expanded_params.erase(expanded_params.begin());
}
}
if (command_it == m_commands.end()) if (command_it == m_commands.end())
throw command_not_found(*begin); throw command_not_found(*begin);
@ -167,7 +182,6 @@ void CommandManager::execute(const CommandParameters& params,
command_it->second.command(CommandParameters(begin + 1, end), context); command_it->second.command(CommandParameters(begin + 1, end), context);
else else
{ {
std::vector<std::string> expanded_params;
for (auto param = begin+1; param != end; ++param) for (auto param = begin+1; param != end; ++param)
{ {
if (param->front() == '`' and param->back() == '`') if (param->front() == '`' and param->back() == '`')