<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14238] CalendarServer/trunk/bin/run</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14238">14238</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 17:52:50 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove cruft; this is not an installer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbinrun">CalendarServer/trunk/bin/run</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbinrun"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/run (14237 => 14238)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/run 2014-12-19 01:52:00 UTC (rev 14237)
+++ CalendarServer/trunk/bin/run 2014-12-19 01:52:50 UTC (rev 14238)
</span><span class="lines">@@ -62,23 +62,20 @@
</span><span class="cx">
</span><span class="cx"> echo "Usage: ${program} [-hvgsfnpdkrR] [-K key] [-iIb dst] [-t type] [-S statsdirectory] [-P plugin]";
</span><span class="cx"> echo "Options:";
</span><del>- echo " -h Print this help and exit";
- echo " -s Run setup only; don't run server";
- 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";
- 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";
- # echo " -b Perform a bundled install (include all dependencies) into dst; implies -s";
- echo " -t Select the server process type (Master, Slave or Combined) [${service_type}]";
- echo " -S Write a pstats object for each process to the given directory when the server is stopped.";
- echo " -P Select the twistd plugin name [${plugin_name}]";
- echo " -R Twisted Reactor plugin to execute [${reactor}]";
</del><ins>+ echo " -h Print this help and exit";
+ echo " -s Run setup only; don't run server";
+ 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";
+ 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 " -t Select the server process type (Master, Slave or Combined) [${service_type}]";
+ echo " -S Write a pstats object for each process to the given directory when the server is stopped.";
+ echo " -P Select the twistd plugin name [${plugin_name}]";
+ echo " -R Twisted Reactor plugin to execute [${reactor}]";
</ins><span class="cx">
</span><span class="cx"> if [ "${1-}" == "-" ]; then
</span><span class="cx"> return 0;
</span><span class="lines">@@ -92,7 +89,6 @@
</span><span class="cx"> parse_options () {
</span><span class="cx"> OPTIND=1;
</span><span class="cx"> print_path="false";
</span><del>- print_environment="false";
</del><span class="cx"> while getopts "ahsfnpedkrc:K:i:I:b:t:S:P:R:" option; do
</span><span class="cx"> case "${option}" in
</span><span class="cx"> '?') usage; ;;
</span><span class="lines">@@ -111,33 +107,6 @@
</span><span class="cx"> 'p')
</span><span class="cx"> do_get="false"; do_setup="false"; run="false"; print_path="true";
</span><span class="cx"> ;;
</span><del>- # 'e')
- # do_get="false"; do_setup="false"; run="false"; print_path="true";
- # print_environment="true";
- # ;;
- # 'i')
- # do_get="true";
- # do_setup="true";
- # run="false";
- # install="${OPTARG}";
- # install_flag="--root=";
- # ;;
- # 'I')
- # do_get="true";
- # do_setup="true";
- # run="false";
- # install="${wd}/build/dst";
- # install_flag="--root=";
- # install_home="${OPTARG}";
- # ;;
- # 'b')
- # do_bundle="true";
- # do_get="true";
- # do_setup="true";
- # run="false";
- # install="${OPTARG}";
- # install_flag="--root=";
- # ;;
</del><span class="cx"> 'n') do_setup="false"; force_setup="false"; ;;
</span><span class="cx"> esac;
</span><span class="cx"> done;
</span><span class="lines">@@ -226,8 +195,6 @@
</span><span class="cx"> # About to do something for real; let's enumerate (and depending on options,
</span><span class="cx"> # possibly download and/or install) the dependencies.
</span><span class="cx">
</span><del>- export _DEVELOP="true";
-
</del><span class="cx"> develop;
</span><span class="cx">
</span><span class="cx"> if "${kill}" || "${restart}"; then
</span><span class="lines">@@ -250,18 +217,6 @@
</span><span class="cx"> fi;
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- # # If we're installing, install the calendar server itself.
- # py_install "Calendar Server" "${wd}";
-
- # if [ -n "${install_home:-}" ]; then
- # do_home_install;
- # fi;
-
- # if "${do_bundle}"; then
- # write_environment;
- # fi;
-
- # Finally, run the server.
</del><span class="cx"> run;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>