summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2009-04-21 16:22:03 +0000
committerNoah Slater <nslater@apache.org>2009-04-21 16:22:03 +0000
commit5d25740864abdcb5e6a0988ed9341a1a077f01a9 (patch)
treefec3027341ef9a181de60d7b03a9c232383fc0a5 /bin
parent9488ee212197cf6361c7cfe8b1cc3e587b33e273 (diff)
added -A for adding configuration directories
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@767206 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'bin')
-rw-r--r--bin/couchdb.tpl.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index f4a0c72d..f74f863f 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -71,6 +71,7 @@ Options:
-h display a short help message and exit
-V display version information and exit
-a FILE add configuration FILE to chain
+ -A DIR add configuration DIR to chain
-n reset configuration file chain (including system default)
-c print configuration file chain and exit
-i use the interactive Erlang shell
@@ -291,7 +292,7 @@ stop_couchdb () {
parse_script_option_list () {
_load_config
set +e
- options=`getopt hVa:ncibp:r:Ro:e:skd $@`
+ options=`getopt hVa:A:ncibp:r:Ro:e:skd $@`
if test ! $? -eq 0; then
display_error
fi
@@ -302,6 +303,7 @@ parse_script_option_list () {
-h) shift; display_help; exit;;
-V) shift; display_version; exit;;
-a) shift; _add_config_file "$1"; shift;;
+ -A) shift; _add_config_dir "$1"; shift;;
-n) shift; _reset_config;;
-c) shift; _print_config; exit;;
-i) shift; INTERACTIVE=true;;