couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r749321 - in /couchdb/trunk: THANKS bin/couchdb.tpl.in
Date Mon, 02 Mar 2009 14:50:16 GMT
Author: nslater
Date: Mon Mar  2 14:50:15 2009
New Revision: 749321

URL: http://svn.apache.org/viewvc?rev=749321&view=rev
Log:
added -C option to couchdb script, thanks Eric Casteleijn

Modified:
    couchdb/trunk/THANKS
    couchdb/trunk/bin/couchdb.tpl.in

Modified: couchdb/trunk/THANKS
URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=749321&r1=749320&r2=749321&view=diff
==============================================================================
--- couchdb/trunk/THANKS (original)
+++ couchdb/trunk/THANKS Mon Mar  2 14:50:15 2009
@@ -26,5 +26,6 @@
  * Brian Palmer <jira@brian.codekitchen.net>
  * Jason Davies <jason@jasondavies.com>
  * Maximillian Dornseif <md@hudora.de>
+ * Eric Casteleijn <eric.casteleijn@canonical.com>
 
 For a list of authors see the `AUTHORS` file.

Modified: couchdb/trunk/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/bin/couchdb.tpl.in?rev=749321&r1=749320&r2=749321&view=diff
==============================================================================
--- couchdb/trunk/bin/couchdb.tpl.in (original)
+++ couchdb/trunk/bin/couchdb.tpl.in Mon Mar  2 14:50:15 2009
@@ -20,6 +20,7 @@
 KILL_BOOLEAN=false
 SHUTDOWN_BOOLEAN=false
 RECURSED_BOOLEAN=false
+RESET_CONFIG_BOOLEAN=true
 
 RESPAWN_TIMEOUT=0
 
@@ -70,6 +71,7 @@
   -h          display a short help message and exit
   -V          display version information and exit
   -c FILE     use configuration FILE (chainable, resets system default)
+  -C FILE     use configuration FILE (chainable, does not reset system default)
   -i          use the interactive Erlang shell
   -b          spawn as a background process
   -p FILE     set the background PID FILE (overrides system default)
@@ -168,7 +170,11 @@
         interactive_option="+Bd -noinput"
     fi
     if test -n "$INI_FILES"; then
-        ini_files="$INI_FILES"
+        if test "$RESET_CONFIG_BOOLEAN" = "true"; then
+            ini_files="$INI_FILES"
+        else
+            ini_files="$DEFAULT_INI_FILE $INI_FILES"
+        fi
     else
         ini_files="$DEFAULT_INI_FILE $LOCAL_INI_FILE"
     fi
@@ -258,7 +264,7 @@
 
 parse_script_option_list () {
     set +e
-    options=`getopt hVc:ibp:r:Ro:e:skd $@`
+    options=`getopt hVc:C:ibp:r:Ro:e:skd $@`
     if test ! $? -eq 0; then
         display_error
     fi
@@ -269,6 +275,7 @@
             -h) shift; display_help; exit $SCRIPT_OK;;
             -V) shift; display_version; exit $SCRIPT_OK;;
             -c) shift; INI_FILES="$INI_FILES $1"; shift;;
+            -C) shift; RESET_CONFIG_BOOLEAN=false; INI_FILES="$INI_FILES $1"; shift;;
             -i) shift; INTERACTIVE_BOOLEAN=true;;
             -b) shift; BACKGROUND_BOOLEAN=true;;
             -r) shift; RESPAWN_TIMEOUT=$1; shift;;



Mime
View raw message