SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@472 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-26 14:47:02 +00:00
parent 9c3a2cf8ca
commit c711bfb9a3
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/system_daemon/main.cpp
View File

@@ -294,6 +294,7 @@ void usage() {
piCout << "-f --force " << PICoutManipulators::Green << "- don`t check for another running instance";
piCout << "-n --name <name> " << PICoutManipulators::Green << "- set daemon name";
piCout << "-a --address <ip>" << PICoutManipulators::Green << "- connect to remote daemon via tcp";
piCout << "-s --silent " << PICoutManipulators::Green << "- run without user interfase";
}
@@ -305,6 +306,7 @@ int main(int argc, char * argv[]) {
cli.addArgument("force");
cli.addArgument("kill");
cli.addArgument("1");
cli.addArgument("silent");
cli.addArgument("name", true);
cli.addArgument("address", true);
if (cli.hasArgument("help")) {
@@ -329,7 +331,7 @@ int main(int argc, char * argv[]) {
}
if (cli.hasArgument("daemon")) {
PIStringList args;
args << "-1";
args << "-1" << "s";
if (cli.hasArgument("force"))
args << "-f";
if (cli.hasArgument("address"))
@@ -358,10 +360,18 @@ int main(int argc, char * argv[]) {
if (!name.isEmpty())
daemon->changeName(pisd_prefix + name);
MainMenu * menu = new MainMenu(*daemon);
if (sapp) CONNECTU(sapp, messageReceived, menu, messageFromApp)
screen->start();
screen->waitForFinish();
screen->stop(true);
if (sapp) CONNECTU(sapp, messageReceived, menu, messageFromApp);
if (cli.hasArgument("silent")) {
PIKbdListener ls;
ls.enableExitCapture(PIKbdListener::F10);
ls.start();
WAIT_FOR_EXIT
ls.stop();
} else {
screen->start();
screen->waitForFinish();
screen->stop(true);
}
delete menu;
delete daemon;
delete screen;