Author: jan
Date: Sat May 22 21:55:17 2010
New Revision: 947338
URL: http://svn.apache.org/viewvc?rev=947338&view=rev
Log:
Fix Solaris compat.
Patch by Gavin Sherry and Timothy Smith.
Closes COUCHDB-666 \m/
Modified:
couchdb/branches/0.11.x/THANKS
couchdb/branches/0.11.x/bin/couchdb.tpl.in
couchdb/branches/0.11.x/src/couchdb/Makefile.am
couchdb/branches/0.11.x/src/couchdb/couch.app.tpl.in
Modified: couchdb/branches/0.11.x/THANKS
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.11.x/THANKS?rev=947338&r1=947337&r2=947338&view=diff
==============================================================================
--- couchdb/branches/0.11.x/THANKS (original)
+++ couchdb/branches/0.11.x/THANKS Sat May 22 21:55:17 2010
@@ -51,5 +51,7 @@ suggesting improvements or submitting ch
* Matt Lyon <[email protected]>
* mikeal <[email protected]>
* Randall Leeds <[email protected]>
+ * Gavin Sherry <[email protected]>
+ * Timothy Smith <[email protected]>
For a list of authors see the `AUTHORS` file.
Modified: couchdb/branches/0.11.x/bin/couchdb.tpl.in
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.11.x/bin/couchdb.tpl.in?rev=947338&r1=947337&r2=947338&view=diff
==============================================================================
--- couchdb/branches/0.11.x/bin/couchdb.tpl.in (original)
+++ couchdb/branches/0.11.x/bin/couchdb.tpl.in Sat May 22 21:55:17 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/branches/0.11.x/src/couchdb/Makefile.am
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/Makefile.am?rev=947338&r1=947337&r2=947338&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/Makefile.am (original)
+++ couchdb/branches/0.11.x/src/couchdb/Makefile.am Sat May 22 21:55:17 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/branches/0.11.x/src/couchdb/couch.app.tpl.in
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch.app.tpl.in?rev=947338&r1=947337&r2=947338&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch.app.tpl.in (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch.app.tpl.in Sat May 22 21:55:17
2010
@@ -26,4 +26,4 @@
]}},
{applications, [kernel, stdlib]},
{included_applications, [crypto, sasl, inets, oauth, ibrowse, mochiweb]}
-]}.
\ No newline at end of file
+]}.
