From ba543146ea71b218b26a0660f9d28eea817c8fe5 Mon Sep 17 00:00:00 2001
From: Noah Slater <nslater@apache.org>
Date: Fri, 20 Mar 2009 17:26:59 +0000
Subject: fixed shell portability issues, thanks Maarten Thibaut, closes
 COUCHDB-169

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@756665 13f79535-47bb-0310-9956-ffa450edef68
---
 THANKS                  | 1 +
 bin/couchdb.tpl.in      | 6 +++---
 etc/init/couchdb.tpl.in | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/THANKS b/THANKS
index 6f893262..addc0aea 100644
--- a/THANKS
+++ b/THANKS
@@ -27,5 +27,6 @@ Some of these people are:
  * Jason Davies <jason@jasondavies.com>
  * Maximillian Dornseif <md@hudora.de>
  * Eric Casteleijn <eric.casteleijn@canonical.com>
+ * Maarten Thibaut <mthibaut@cisco.com>
 
 For a list of authors see the `AUTHORS` file.
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 33761080..cfa7e575 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -140,15 +140,15 @@ check_environment () {
         exit $SCRIPT_ERROR
     fi
     message_prefix="Apache CouchDB needs a regular"
-    if ! echo 2> /dev/null >> $PID_FILE; then
+    if `echo 2> /dev/null >> $PID_FILE; echo $?` -gt 0; then
         echo "$message_prefix PID file: $PID_FILE" >&2
         exit $SCRIPT_ERROR
     fi
-    if ! echo 2> /dev/null >> $STDOUT_FILE; then
+    if `echo 2> /dev/null >> $STDOUT_FILE; echo $?` -gt 0; then
         echo "$message_prefix STDOUT file: $STDOUT_FILE" >&2
         exit $SCRIPT_ERROR
     fi
-    if ! echo 2> /dev/null >> $STDERR_FILE; then
+    if `echo 2> /dev/null >> $STDERR_FILE; echo $?` -gt 0; then
         echo "$message_prefix STDERR file: $STDERR_FILE" >&2
         exit $SCRIPT_ERROR
     fi
diff --git a/etc/init/couchdb.tpl.in b/etc/init/couchdb.tpl.in
index abfb4af6..c8e4ae33 100644
--- a/etc/init/couchdb.tpl.in
+++ b/etc/init/couchdb.tpl.in
@@ -27,7 +27,7 @@ SCRIPT_ERROR=1
 
 DESCRIPTION="database server"
 NAME=couchdb
-SCRIPT_NAME=$(basename $0)
+SCRIPT_NAME=`basename $0`
 COUCHDB=%bindir%/%couchdb_command_name%
 CONFIGURATION_FILE=%sysconfdir%/default/couchdb
 LSB_LIBRARY=/lib/lsb/init-functions
@@ -63,9 +63,9 @@ start_couchdb () {
     # Start Apache CouchDB as a background process.
 
     command="$COUCHDB -b"
-    if test -n "$COUCHDB_PID_FILE"; then 
-        command="$command -p $COUCHDB_PID_FILE" 
-    fi 
+    if test -n "$COUCHDB_PID_FILE"; then
+        command="$command -p $COUCHDB_PID_FILE"
+    fi
     if test -n "$COUCHDB_STDOUT_FILE"; then
         command="$command -o $COUCHDB_STDOUT_FILE"
     fi
-- 
cgit v1.2.3