- ::onExit now comforms to design.
This commit is contained in:
Paul Beckingham
2014-05-14 22:10:40 -04:00
parent b1c0e67581
commit 0d2bc00527

View File

@@ -118,13 +118,9 @@ void Hooks::onExit ()
{ {
context.timer_hooks.start (); context.timer_hooks.start ();
std::vector <std::string> matchingScripts = scripts ("on-exit");
std::vector <std::string>::iterator i; std::vector <std::string>::iterator i;
for (i = _scripts.begin (); i != _scripts.end (); ++i) for (i = matchingScripts.begin (); i != matchingScripts.end (); ++i)
{
if (i->find ("/on-exit") != std::string::npos)
{
File script (*i);
if (script.executable ())
{ {
std::string output; std::string output;
int status = execute (*i, "", output); int status = execute (*i, "", output);
@@ -133,12 +129,23 @@ void Hooks::onExit ()
split (lines, output, '\n'); split (lines, output, '\n');
std::vector <std::string>::iterator line; std::vector <std::string>::iterator line;
for (line = lines.begin (); line != lines.end (); ++line)
if (status == 0) if (status == 0)
context.footnote (*line); {
else for (line = lines.begin (); line != lines.end (); ++line)
context.error (*line); {
if (line->length () && (*line)[0] == '{')
{
Task newTask (*line);
context.tdb2.add (newTask);
} }
else
context.footnote (*line);
}
}
else
{
for (line = lines.begin (); line != lines.end (); ++line)
context.error (*line);
} }
} }