[gentoo-commits] proj/R_overlay:master commit in: roverlay/scripts/, files/misc/

[gentoo-commits] proj/R_overlay:master commit in: roverlay/scripts/, files/misc/

[André Erdmann]

commit:     23927133d09d15e4b243edb240d7110983ef90fe
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed May  7 01:22:48 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed May  7 01:22:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=23927133

roverlay-query-config: rename arg "-C" -> "-c"

---
 files/misc/roverlay.bashcomp     | 4 ++--
 roverlay/scripts/query_config.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/misc/roverlay.bashcomp b/files/misc/roverlay.bashcomp
index 6d43522..d9bfdf2 100644
--- a/files/misc/roverlay.bashcomp
+++ b/files/misc/roverlay.bashcomp
@@ -331,11 +331,11 @@ _roverlay_query_config_comp() {
       '--empty-missing' '--from-file' '--outfile' '--variable'
    )
    local SHORTOPTS=(
-      '-h' '-C' '-a' '-l' '-u' '-f' '-O' '-v'
+      '-h' '-c' '-a' '-l' '-u' '-f' '-O' '-v'
    )
 
    case "${prev}" in
-      '-C'|'--config-file'|'-f'|'--from-file'|'-O'|'--outfile')
+      '-c'|'--config-file'|'-f'|'--from-file'|'-O'|'--outfile')
          # <file> arg
          _filedir
       ;;

diff --git a/roverlay/scripts/query_config.py b/roverlay/scripts/query_config.py
index 0452a11..96ca8b4 100644
--- a/roverlay/scripts/query_config.py
+++ b/roverlay/scripts/query_config.py
@@ -15,7 +15,7 @@
 #     Lists all known config options.
 #     (Note: it's not possible to query all of these options)
 #
-#  * query-config [-C <config_file>] [-u] [-a|{option[=varname]}]
+#  * query-config [-c <config_file>] [-u] [-a|{option[=varname]}]
 #
 #     Prints roverlay's config options in shell usable format (without relying
 #     on roverlay-sh). Prints all options if -a/--all is specified or no
@@ -27,7 +27,7 @@
 #       $ echo $OVERLAY
 #       $ echo $OVERLAY_NAME
 #
-#  * query-config [-C <config_file>] [-u] -f <infile> [-O <outfile>|-] {-v VAR[=VALUE]}
+#  * query-config [-c <config_file>] [-u] -f <infile> [-O <outfile>|-] {-v VAR[=VALUE]}
 #
 #     Replaces occurences of @@VARIABLES@@ in <infile> with values taken
 #     from roverlay's config and writes the result to <outfile> or stdout.
@@ -36,7 +36,7 @@
 #
 #     Usage example:
 #
-#       $ query-config -C ~roverlay_user/roverlay/R-overlay.conf \
+#       $ query-config -c ~roverlay_user/roverlay/R-overlay.conf \
 #          -f nginx.conf.in -O nginx.conf -v SERVER_ADDR=... -v SERVER_NAME=...
 #
 #     A non-zero exit code indicates that one or more variables could not be
@@ -165,7 +165,7 @@ def get_parser():
    )
 
    parser.add_argument (
-      "-C", "--config-file", metavar="<file>", default=None,
+      "-c", "--config-file", metavar="<file>", default=None,
       type=arg_is_filepath_or_none,
       help="path to the config file",
    )