run script should parse_options() before including build.sh

[software@…]

I am trying to install a carddav server, and after building the sources, I get this error:

./run -a

Missing config file: /home/freek/calendarserver/conf/caldavd-dev.plist
You might want to start by copying the test configuration:

  cp conf/carddavd-test.plist conf/carddavd-dev.plist

This is obviously wrong (caldav-dev.plist is missing, but I need to cp cardav-dev.plist?)

The reasons is that the first line is defined in support/build.sh, which defines $conf as "${wd}/conf/${DAVD}davd-dev.plist";. However, build.sh is included (and executed!) before run has set $DAVD correctly.

The solution is to to first let run set $DAVD, before including build.sh

Patch is attached.

[software@…]

Patch

[glyph@…]

That won't work, as the "init_build" at the end of build.sh will just wipe out the options parsed by parse_options.

While the ordering could be better here, the right thing to do is just to get rid of the '-a' option, as it's no longer necessary; you can run a caldav/carddav combo server, or select carddav entirely via the plist. No command-line options are necessary to distinguish between the two, the '-a' option was simply a stopgap as we were working on merging them.

[wsanchez@…]

-a is gone in r6385