Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 43164 invoked from network); 20 Mar 2009 17:27:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Mar 2009 17:27:29 -0000 Received: (qmail 63073 invoked by uid 500); 20 Mar 2009 17:27:28 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 63054 invoked by uid 500); 20 Mar 2009 17:27:28 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 63045 invoked by uid 99); 20 Mar 2009 17:27:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2009 10:27:28 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2009 17:27:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 996D22388965; Fri, 20 Mar 2009 17:27:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r756665 - in /couchdb/trunk: THANKS bin/couchdb.tpl.in etc/init/couchdb.tpl.in Date: Fri, 20 Mar 2009 17:27:00 -0000 To: commits@couchdb.apache.org From: nslater@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090320172700.996D22388965@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 * Maximillian Dornseif * Eric Casteleijn + * Maarten Thibaut 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