[Fawkes Git] branch/thofmann/bash-completion: baseapp: update help text to include plugins as new positional arguments

Till Hofmann hofmann at kbsg.rwth-aachen.de
Fri Aug 26 16:00:23 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, thofmann/bash-completion has been updated
        to  88ebc52f0d7a634bf2f11915f4a58465e011fa22 (commit)
      from  b2cdee485f55b6b8148665fca594ae599a2f8375 (commit)

http://git.fawkesrobotics.org/fawkes.git/thofmann/bash-completion

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 88ebc52f0d7a634bf2f11915f4a58465e011fa22
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Fri Aug 26 15:47:35 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Fri Aug 26 15:59:33 2016 +0200

    baseapp: update help text to include plugins as new positional arguments
    
    Plugins can now also be given as positional arguments.
    Change the help text accordingly.

http://git.fawkesrobotics.org/fawkes.git/commit/88ebc52
http://trac.fawkesrobotics.org/changeset/88ebc52

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/libs/baseapp/run.cpp |   68 +++++++++++++++++++++++----------------------
 1 files changed, 35 insertions(+), 33 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 88ebc52f0d7a634bf2f11915f4a58465e011fa22 - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Fri Aug 26 15:47:35 2016 +0200
Subject: baseapp: update help text to include plugins as new positional arguments

 src/libs/baseapp/run.cpp |   68 +++++++++++++++++++++++----------------------
 1 files changed, 35 insertions(+), 33 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/baseapp/run.cpp b/src/libs/baseapp/run.cpp
index 1a60d72..f721eca 100644
--- a/src/libs/baseapp/run.cpp
+++ b/src/libs/baseapp/run.cpp
@@ -514,41 +514,43 @@ void
 print_usage(const char *progname)
 {
   printf("Fawkes Main Application - Usage Instructions\n"
-	 "================================================"
-	 "===============================\n"
-	 "Usage: %s [options]\n"
-	 "where [options] is one or more of:\n"
-         " -h                       These help instructions\n"
-         " -C                       Cleanup old BB and shared memory segments\n"
-         " -c config file           Configuration file to load.\n"
-	 "                          Examples: default.sql or config.yaml\n"
-         " -d                       Enable debug output\n"
-         " -q[qqq]                  Quiet mode, -q omits debug, -qq debug and"
-	 "info,\n                          "
-	 "-qqq omit debug, info and warn, -qqqq no output\n"
-         " -l level                 Set log level directly mutually exclusive"
-	 "with -q,\n                          "
-	 "level is one of debug, info, warn, error, or none\n"
-         " -L loggers               Define loggers. By default this setting is"
-	 "read from\n                          "
-	 "config (console logger if unset). Format is:\n"
-	 "                          logger:args[;logger2:args2[!...]]\n"
-	 "                          Currently supported:\n"
-         "                          console, file:file.log, network logger always added\n"
-         " -p plugins               List of plugins to load on startup in given order\n"
-         " -P port                  TCP port to listen on for Fawkes network connections.\n"
-         " --net-service-name=name  mDNS service name to use.\n"
-	 " -u user                  Drop privileges and run as given user.\n"
-         " -g group                 Drop privileges and run as given group.\n"
+  "================================================"
+  "===============================\n"
+  "Usage: %s [options] [plugins]\n"
+  "where\n"
+  " [plugins] is a space-separated list of plugins to load on startup in given order\n"
+  " [options] is one or more of:\n"
+    "  -h                       These help instructions\n"
+    "  -C                       Cleanup old BB and shared memory segments\n"
+    "  -c config file           Configuration file to load.\n"
+    "                           Examples: default.sql or config.yaml\n"
+    "  -d                       Enable debug output\n"
+    "  -q[qqq]                  Quiet mode, -q omits debug, -qq debug and"
+      "info,\n                           "
+      "-qqq omit debug, info and warn, -qqqq no output\n"
+    "  -l level                 Set log level directly mutually exclusive"
+      "with -q,\n                           "
+      "level is one of debug, info, warn, error, or none\n"
+    "  -L loggers               Define loggers. By default this setting is"
+      "read from\n                           "
+      "config (console logger if unset). Format is:\n"
+      "                           logger:args[;logger2:args2[!...]]\n"
+      "                           Currently supported:\n"
+      "                           console, file:file.log, network logger always added\n"
+    "  -p plugins               List of plugins to load on startup in given order\n"
+    "  -P port                  TCP port to listen on for Fawkes network connections.\n"
+      "  --net-service-name=name  mDNS service name to use.\n"
+    "  -u user                  Drop privileges and run as given user.\n"
+    "  -g group                 Drop privileges and run as given group.\n"
 #ifdef HAVE_LIBDAEMON
-         " -D[pid file]             Run daemonized in the background, pid file "
-	 "is optional,\n                          "
-	 "default is /var/run/fawkes.pid, must be absolute path.\n"
-         " -D[pid file] -k          Kill a daemonized Fawkes running in the"
-	 "background\n"
-         " -D[pid file] -s          Check status of daemon.\n"
+    "  -D[pid file]             Run daemonized in the background, pid file "
+      "is optional,\n                           "
+      "default is /var/run/fawkes.pid, must be absolute path.\n"
+    "  -D[pid file] -k          Kill a daemonized Fawkes running in the"
+      "background\n"
+    "  -D[pid file] -s          Check status of daemon.\n"
 #endif
-	 "\n", progname);
+  "\n", progname);
 }
 
 




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list