[CalendarServer-changes] [12464] CalendarServer/trunk/bin/run
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:24:15 PDT 2014
Revision: 12464
http://trac.calendarserver.org//changeset/12464
Author: wsanchez at apple.com
Date: 2014-01-28 10:52:31 -0800 (Tue, 28 Jan 2014)
Log Message:
-----------
Fix -n, re-add -f.
Modified Paths:
--------------
CalendarServer/trunk/bin/run
Modified: CalendarServer/trunk/bin/run
===================================================================
--- CalendarServer/trunk/bin/run 2014-01-28 18:52:09 UTC (rev 12463)
+++ CalendarServer/trunk/bin/run 2014-01-28 18:52:31 UTC (rev 12464)
@@ -44,7 +44,7 @@
reactor="";
plugin_name="caldav";
service_type="Combined";
- setup="true";
+ do_setup="true";
run="true";
daemonize="-X -L";
kill="false";
@@ -64,7 +64,7 @@
echo "Options:";
echo " -h Print this help and exit";
echo " -s Run setup only; don't run server";
- # echo " -f Force setup to run";
+ echo " -f Force setup to run";
echo " -n Do not run setup";
# echo " -p Print PYTHONPATH value for server and exit";
# echo " -e Print =-separated environment variables required to run and exit";
@@ -95,7 +95,7 @@
case "${option}" in
'?') usage; ;;
'h') usage -; exit 0; ;;
- # 'f') force_setup="true"; ;;
+ 'f') force_setup="true"; do_setup="true"; ;;
'k') kill="true"; ;;
'r') restart="true"; ;;
'd') daemonize=""; ;;
@@ -104,24 +104,24 @@
't') service_type="${OPTARG}"; ;;
'K') read_key="${OPTARG}"; ;;
'S') profile="-p ${OPTARG}"; ;;
- 's') setup="true" ; run="false"; ;;
+ 's') do_setup="true"; run="false"; ;;
# 'p')
- # do_get="false"; setup="false"; run="false"; print_path="true";
+ # do_get="false"; do_setup="false"; run="false"; print_path="true";
# ;;
# 'e')
- # do_get="false"; setup="false"; run="false"; print_path="true";
+ # do_get="false"; do_setup="false"; run="false"; print_path="true";
# print_environment="true";
# ;;
# 'i')
# do_get="true";
- # setup="true";
+ # do_setup="true";
# run="false";
# install="${OPTARG}";
# install_flag="--root=";
# ;;
# 'I')
# do_get="true";
- # setup="true";
+ # do_setup="true";
# run="false";
# install="${wd}/build/dst";
# install_flag="--root=";
@@ -130,12 +130,12 @@
# 'b')
# do_bundle="true";
# do_get="true";
- # setup="true";
+ # do_setup="true";
# run="false";
# install="${OPTARG}";
# install_flag="--root=";
# ;;
- 'n') setup="false"; ;;
+ 'n') do_setup="false"; force_setup="false"; ;;
esac;
done;
shift $((${OPTIND} - 1));
@@ -241,13 +241,8 @@
export CALENDARSERVER_DEVELOP="true";
- init_build;
+ develop;
- if "${setup}"; then
- c_dependencies;
- py_dependencies;
- fi;
-
# # Now that all the dependencies are set up, let's see if we're just being
# # asked to print the path.
# if "${print_path}"; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/1d105c04/attachment.html>
More information about the calendarserver-changes
mailing list