You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2009/03/20 18:27:00 UTC
svn commit: r756665 - in /couchdb/trunk: THANKS bin/couchdb.tpl.in
etc/init/couchdb.tpl.in
Author: nslater
Date: Fri Mar 20 17:26:59 2009
New Revision: 756665
URL: http://svn.apache.org/viewvc?rev=756665&view=rev
Log:
fixed shell portability issues, thanks Maarten Thibaut, closes COUCHDB-169
Modified:
couchdb/trunk/THANKS
couchdb/trunk/bin/couchdb.tpl.in
couchdb/trunk/etc/init/couchdb.tpl.in
Modified: couchdb/trunk/THANKS
URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=756665&r1=756664&r2=756665&view=diff
==============================================================================
--- couchdb/trunk/THANKS (original)
+++ couchdb/trunk/THANKS Fri Mar 20 17:26:59 2009
@@ -27,5 +27,6 @@
* Jason Davies <ja...@jasondavies.com>
* Maximillian Dornseif <md...@hudora.de>
* Eric Casteleijn <er...@canonical.com>
+ * Maarten Thibaut <mt...@cisco.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=756665&r1=756664&r2=756665&view=diff
==============================================================================
--- couchdb/trunk/bin/couchdb.tpl.in (original)
+++ couchdb/trunk/bin/couchdb.tpl.in Fri Mar 20 17:26:59 2009
@@ -140,15 +140,15 @@
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
Modified: couchdb/trunk/etc/init/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/init/couchdb.tpl.in?rev=756665&r1=756664&r2=756665&view=diff
==============================================================================
--- couchdb/trunk/etc/init/couchdb.tpl.in (original)
+++ couchdb/trunk/etc/init/couchdb.tpl.in Fri Mar 20 17:26:59 2009
@@ -27,7 +27,7 @@
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 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