svn commit: r947337 - in /couchdb/trunk: THANKS bin/couchdb.tpl.in src/couchdb/Makefile.am src/couchdb/couch.app.tpl.in

[ja...@apache.org]

Author: jan
Date: Sat May 22 21:46:08 2010
New Revision: 947337

URL: http://svn.apache.org/viewvc?rev=947337&view=rev
Log:
Fix Solaris compat.
Patch by Gavin Sherry and Timothy Smith.
Closes COUCHDB-666 \m/

Modified:
    couchdb/trunk/THANKS
    couchdb/trunk/bin/couchdb.tpl.in
    couchdb/trunk/src/couchdb/Makefile.am
    couchdb/trunk/src/couchdb/couch.app.tpl.in

Modified: couchdb/trunk/THANKS
URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=947337&r1=947336&r2=947337&view=diff
==============================================================================
--- couchdb/trunk/THANKS (original)
+++ couchdb/trunk/THANKS Sat May 22 21:46:08 2010
@@ -54,5 +54,7 @@ suggesting improvements or submitting ch
  * Joscha Feth <jo...@feth.com>
  * Jarrod Roberson <ja...@vertigrated.com>
  * Jae Kwon <jk...@gmail.com>
+ * Gavin Sherry <sw...@alcove.com.au>
+ * Timothy Smith <ti...@couch.io>
 
 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=947337&r1=947336&r2=947337&view=diff
==============================================================================
--- couchdb/trunk/bin/couchdb.tpl.in (original)
+++ couchdb/trunk/bin/couchdb.tpl.in Sat May 22 21:46:08 2010
@@ -120,8 +120,8 @@ EOF
 }
 
 _add_config_dir () {
-    for file in `find "$1" -mindepth 1 -maxdepth 1 -type f -name '*.ini'`; do
-        _add_config_file $file
+    for file in "$1"/*.ini; do
+        [ -r "$file" ] && _add_config_file "$file"
     done
 }
 

Modified: couchdb/trunk/src/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/Makefile.am?rev=947337&r1=947336&r2=947337&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/Makefile.am (original)
+++ couchdb/trunk/src/couchdb/Makefile.am Sat May 22 21:46:08 2010
@@ -179,7 +179,7 @@ couch.app: couch.app.tpl
 	$@ < $<
 else
 couch.app: couch.app.tpl
-	modules=`find . -name "*.erl" -exec basename {} .erl \; | tr '\n' ',' | sed "s/,$$//"`; \
+	modules=`{ find . -name "*.erl" -exec basename {} .erl \; | tr '\n' ','; echo ''; } | sed "s/,$$//"`; \
 	sed -e "s|%package_name%|@package_name@|g" \
 	    -e "s|%version%|@version@|g" \
 	    -e "s|@modules@|$$modules|g" \

Modified: couchdb/trunk/src/couchdb/couch.app.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch.app.tpl.in?rev=947337&r1=947336&r2=947337&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch.app.tpl.in (original)
+++ couchdb/trunk/src/couchdb/couch.app.tpl.in Sat May 22 21:46:08 2010
@@ -26,4 +26,4 @@
     ]}},
     {applications, [kernel, stdlib]},
     {included_applications, [crypto, sasl, inets, oauth, ibrowse, mochiweb]}
-]}.
\ No newline at end of file
+]}.