From 415856bdd4f48ab4f2732996f0bae58595092bbe Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Tue, 5 Apr 2011 14:26:38 +0000
Subject: Tue Apr  5 14:26:38 UTC 2011

---
 community/couchdb/rc-script.patch | 90 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 community/couchdb/rc-script.patch

(limited to 'community/couchdb/rc-script.patch')

diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch
new file mode 100644
index 000000000..d38f4dc6c
--- /dev/null
+++ b/community/couchdb/rc-script.patch
@@ -0,0 +1,90 @@
+--- couchdb.org	2011-04-01 19:56:32.000000000 +0000
++++ couchdb	2011-04-01 19:59:17.000000000 +0000
+@@ -1,4 +1,7 @@
+-#!/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 @@
+ NAME=couchdb
+ SCRIPT_NAME=`basename $0`
+ COUCHDB=/usr/bin/couchdb
+-CONFIGURATION_FILE=/etc/default/couchdb
++CONFIGURATION_FILE=/etc/conf.d/couchdb
+ RUN_DIR=/var/run/couchdb
+ LSB_LIBRARY=/lib/lsb/init-functions
+ 
+@@ -61,8 +63,9 @@
+ fi
+ 
+ start_couchdb () {
+-    # Start Apache CouchDB as a background process.
++    stat_busy "Starting the CouchDB daemon"
+ 
++    [ -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
+     fi
+ }
+ 
+ stop_couchdb () {
+-    # Stop the running Apache CouchDB process.
++    stat_busy "Stopping the CouchDB daemon"
+ 
+     command="$COUCHDB -d"
+     if test -n "$COUCHDB_OPTIONS"; then
+         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
+         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 () {
-- 
cgit v1.2.3-54-g00ecf