diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-24 23:14:38 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-24 23:14:38 +0000 |
| commit | f53c212680c1817ef2337855ef8814dea6b07e4e (patch) | |
| tree | c93db9dbaade4f2c86a8d550c237edf7d574f6da /community/couchdb/rc-script.patch | |
| parent | 9254c2bc6500471b22eead69781ddef84f87e2bf (diff) | |
Wed Aug 24 23:14:37 UTC 2011
Diffstat (limited to 'community/couchdb/rc-script.patch')
| -rw-r--r-- | community/couchdb/rc-script.patch | 91 |
1 files changed, 25 insertions, 66 deletions
diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch index d38f4dc6c..d7fd105c4 100644 --- a/community/couchdb/rc-script.patch +++ b/community/couchdb/rc-script.patch @@ -1,15 +1,14 @@ ---- couchdb.org 2011-04-01 19:56:32.000000000 +0000 -+++ couchdb 2011-04-01 19:59:17.000000000 +0000 -@@ -1,4 +1,7 @@ +--- couchdb.orig 2011-08-23 13:13:45.000000000 +0400 ++++ couchdb 2011-08-23 13:34:20.000000000 +0400 +@@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/bash -+#general config +. /etc/rc.conf +. /etc/rc.d/functions # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy of -@@ -29,7 +32,7 @@ +@@ -29,7 +31,7 @@ NAME=couchdb SCRIPT_NAME=`basename $0` COUCHDB=/usr/bin/couchdb @@ -18,73 +17,33 @@ RUN_DIR=/var/run/couchdb LSB_LIBRARY=/lib/lsb/init-functions -@@ -61,8 +63,9 @@ +@@ -42,16 +44,14 @@ fi - start_couchdb () { -- # Start Apache CouchDB as a background process. -+ stat_busy "Starting the CouchDB daemon" + log_daemon_msg () { +- # Dummy function to be replaced by LSB library. +- +- echo $@ ++ stat_busy $@ + } -+ [ -d /var/run/couchdb ] || mkdir -p /var/run/couchdb - command="$COUCHDB -b" - if test -n "$COUCHDB_STDOUT_FILE"; then - command="$command -o $COUCHDB_STDOUT_FILE" -@@ -79,38 +82,38 @@ - mkdir -p "$RUN_DIR" - if test -n "$COUCHDB_USER"; then - chown $COUCHDB_USER "$RUN_DIR" -- if su $COUCHDB_USER -c "$command" > /dev/null; then -- return $SCRIPT_OK -+ if su $COUCHDB_USER -s /bin/bash -c "$command" > /dev/null; then -+ stat_done - else -- return $SCRIPT_ERROR -+ stat_fail - fi - else - if $command > /dev/null; then -- return $SCRIPT_OK -+ stat_done - else -- return $SCRIPT_ERROR -+ stat_fail - fi + log_end_msg () { +- # Dummy function to be replaced by LSB library. +- + if test "$1" != "0"; then +- echo "Error with $DESCRIPTION: $NAME" ++ stat_fail ++ else ++ stat_done fi + return $1 } - - stop_couchdb () { -- # Stop the running Apache CouchDB process. -+ stat_busy "Stopping the CouchDB daemon" - - command="$COUCHDB -d" - if test -n "$COUCHDB_OPTIONS"; then +@@ -66,7 +66,7 @@ command="$command $COUCHDB_OPTIONS" fi if test -n "$COUCHDB_USER"; then -- if su $COUCHDB_USER -c "$command" > /dev/null; then -- return $SCRIPT_OK -+ if su $COUCHDB_USER -s /bin/bash -c "$command" > /dev/null; then -+ stat_done +- if su $COUCHDB_USER -c "$command"; then ++ if su $COUCHDB_USER -s /bin/bash -c "$command"; then + return $SCRIPT_OK else -- return $SCRIPT_ERROR -+ stat_fail - fi - else - if $command > /dev/null; then -- return $SCRIPT_OK -+ stat_done - else -- return $SCRIPT_ERROR -+ stat_fail - fi - fi - } -@@ -118,7 +121,7 @@ - display_status () { - # Display the status of the running Apache CouchDB process. - -- $COUCHDB -s -+ $COUCHDB $COUCHDB_OPTIONS -s - } - - parse_script_option_list () { + return $SCRIPT_ERROR |