[CalendarServer-changes] [6473] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Oct 27 15:17:11 PDT 2010
Revision: 6473
http://trac.macosforge.org/projects/calendarserver/changeset/6473
Author: wsanchez at apple.com
Date: 2010-10-27 15:17:09 -0700 (Wed, 27 Oct 2010)
Log Message:
-----------
Get rid of ${DAVD}
Modified Paths:
--------------
CalendarServer/trunk/run
CalendarServer/trunk/support/build.sh
CalendarServer/trunk/test
Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run 2010-10-27 18:53:51 UTC (rev 6472)
+++ CalendarServer/trunk/run 2010-10-27 22:17:09 UTC (rev 6473)
@@ -35,8 +35,6 @@
wd="$(cd "$(dirname "$0")" && pwd)";
-DAVD="cal"
-
# Echo the usage for the main 'run' script, then exit with an error.
usage () {
program="$(basename "$0")";
@@ -55,9 +53,9 @@
echo " -f Force setup to run";
echo " -n Do not run setup";
echo " -p Print PYTHONPATH value for server and exit";
- echo " -d Run ${DAVD}davd as a daemon";
- echo " -k Stop ${DAVD}davd";
- echo " -r Restart ${DAVD}davd";
+ echo " -d Run caldavd as a daemon";
+ echo " -k Stop caldavd";
+ echo " -r Restart caldavd";
echo " -K Print value of configuration key and exit";
echo " -i Perform a system install into dst; implies -s";
echo " -I Perform a home install into dst; implies -s";
@@ -118,7 +116,7 @@
echo "Missing config file: ${config}";
echo "You might want to start by copying the test configuration:";
echo "";
- echo " cp conf/${DAVD}davd-test.plist conf/${DAVD}davd-dev.plist";
+ echo " cp conf/caldavd-test.plist conf/caldavd-dev.plist";
echo "";
if [ -t 0 ]; then
# Interactive shell
@@ -127,7 +125,7 @@
case "${answer}" in
y|yes|Y|YES|Yes)
echo "Copying test cofiguration...";
- cp "${wd}/conf/${DAVD}davd-test.plist" "${wd}/conf/${DAVD}davd-dev.plist";
+ cp "${wd}/conf/caldavd-test.plist" "${wd}/conf/caldavd-dev.plist";
;;
*)
exit 1;
@@ -146,7 +144,7 @@
echo "";
echo "Starting server...";
exec ${caldavd_wrapper_command} \
- "${caldav}/bin/${DAVD}davd" ${daemonize} \
+ "${caldav}/bin/caldavd" ${daemonize} \
-f "${config}" \
-P "${plugin_name}" \
-t "${service_type}" \
Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh 2010-10-27 18:53:51 UTC (rev 6472)
+++ CalendarServer/trunk/support/build.sh 2010-10-27 22:17:09 UTC (rev 6473)
@@ -51,7 +51,7 @@
# These variables are defaults for things which might be configured by
# environment; only set them if they're un-set.
conditional_set wd "$(pwd)";
- conditional_set config "${wd}/conf/${DAVD}davd-dev.plist";
+ conditional_set config "${wd}/conf/caldavd-dev.plist";
conditional_set caldav "${wd}";
if [ -z "${CALENDARSERVER_CACHE_DEPS-}" ]; then
Modified: CalendarServer/trunk/test
===================================================================
--- CalendarServer/trunk/test 2010-10-27 18:53:51 UTC (rev 6472)
+++ CalendarServer/trunk/test 2010-10-27 22:17:09 UTC (rev 6473)
@@ -21,8 +21,6 @@
wd="$(cd "$(dirname "$0")" && pwd -L)";
-DAVD=cal;
-
. support/build.sh;
do_setup="false";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101027/e7b288cd/attachment.html>
More information about the calendarserver-changes
mailing list