On 24 May 2010, at 12:51, Jason Smith wrote: > On Sun, May 23, 2010 at 05:28, <[email protected]> wrote: > >> Author: jan >> Date: Sat May 22 22:28:09 2010 >> New Revision: 947343 >> >> URL: http://svn.apache.org/viewvc?rev=947343&view=rev >> Log: >> fix utils/run >> >> Modified: >> couchdb/trunk/bin/couchdb.tpl.in >> >> Modified: couchdb/trunk/bin/couchdb.tpl.in >> URL: >> http://svn.apache.org/viewvc/couchdb/trunk/bin/couchdb.tpl.in?rev=947343&r1=947342&r2=947343&view=diff >> >> ============================================================================== >> --- couchdb/trunk/bin/couchdb.tpl.in (original) >> +++ couchdb/trunk/bin/couchdb.tpl.in Sat May 22 22:28:09 2010 >> @@ -121,7 +121,9 @@ EOF >> >> _add_config_dir () { >> for file in "$1"/*.ini; do >> - [ -r "$file" ] && _add_config_file "$file" >> + if [ -r "$file" ]; then >> + _add_config_file "$file" >> + fi >> done >> } >> > > Hi, Jan. What made you feel you had to change this? > > I've had odd script errors on various platforms. I couldn't put my finger on > them and just muddled through. Since this comes right after your Solaris > commits, I'm hoping it's related. What gives? Thanks!
I committed Tim’s fix for Solaris after verifying that `make distcheck` works Linux and Mac OS X. Then I tried to run `make dev && utils/run` for testing Volker's patch and `utils/run` exited on that line. It uses `sh -e` to halt on errors, so it looks like there is a return value that makes sh halt. IIRC this could be because I use a git repo and don't have the empty default.d / local.d directories (because git doesn't track empty dirs). It also looks more explicit and less magicy to me. Cheers Jan --
