[CalendarServer-changes] [822] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Dec 12 17:09:58 PST 2006
Revision: 822
http://trac.macosforge.org/projects/calendarserver/changeset/822
Author: wsanchez at apple.com
Date: 2006-12-12 17:09:57 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
Allow specification of plugin name
Modified Paths:
--------------
CalendarServer/trunk/bin/caldavd
CalendarServer/trunk/run
Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd 2006-12-13 00:55:18 UTC (rev 821)
+++ CalendarServer/trunk/bin/caldavd 2006-12-13 01:09:57 UTC (rev 822)
@@ -23,6 +23,7 @@
groupname="";
configfile="";
twistdpath="$(type -p twistd)";
+plugin_name="caldav";
py_version ()
{
@@ -87,15 +88,16 @@
exit 64;
}
-while getopts 'hXu:g:f:T:' option; do
+while getopts 'hXu:g:f:T:P:' option; do
case "${option}" in
'?') usage; ;;
'h') usage -; exit 0; ;;
- 'X') daemonize='-n'; ;;
+ 'X') daemonize="-n"; ;;
'f') configfile="-f ${OPTARG}"; ;;
'T') twistdpath="${OPTARG}"; ;;
'u') username="-u ${OPTARG}"; ;;
'g') grouname="-g ${OPTARG}"; ;;
+ 'P') plugin_name="${OPTARG}"; ;;
esac;
done;
@@ -103,6 +105,4 @@
if [ $# != 0 ]; then usage "Unrecognized arguments:" "$@"; fi;
-exec "${python}" "${twistdpath}" \
- "${daemonize}" ${username} ${groupname} caldav ${configfile};
-
+exec "${python}" "${twistdpath}" "${daemonize}" ${username} ${groupname} "${plugin_name}" ${configfile};
Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run 2006-12-13 00:55:18 UTC (rev 821)
+++ CalendarServer/trunk/run 2006-12-13 01:09:57 UTC (rev 822)
@@ -34,6 +34,7 @@
print_path="false";
install="";
daemonize="-X";
+ plugin_name="caldav";
usage ()
{
@@ -57,7 +58,7 @@
exit 64;
}
-while getopts 'hvsfnpdi:I:' option; do
+while getopts 'hvsfnpdP:i:I:' option; do
case "$option" in
'?') usage; ;;
'h') usage -; exit 0; ;;
@@ -67,6 +68,7 @@
'n') disable_setup="true"; ;;
'p') print_path="true"; ;;
'd') daemonize=""; ;;
+ 'P') plugin_name="${OPTARG}"; ;;
'i') setup_only="true"; install="${OPTARG}"; install_flag="--root="; ;;
'I') setup_only="true"; install="${wd}/build/dst"; install_flag="--root="; install_home="${OPTARG}"; ;;
esac;
@@ -179,7 +181,9 @@
cd "${wd}";
exec /bin/sh "${caldav}/bin/caldavd" ${daemonize} \
-f "${config}" \
- -T "${twisted}/bin/twistd";
+ -T "${twisted}/bin/twistd" \
+ -P "${plugin_name}" \
+ ;
cd /;
fi;
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061212/70f0fbb0/attachment.html
More information about the calendarserver-changes
mailing list