<!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>[12683] CalendarServer/trunk/bin</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/12683">12683</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 13:28:22 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix various run scripts issues that were causing -d, -k invocations to fail.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunkbin_calendarserver_preamblepy">CalendarServer/trunk/bin/_calendarserver_preamble.py</a></li>
<li><a href="#CalendarServertrunkbinrun">CalendarServer/trunk/bin/run</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (12682 => 12683)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2014-02-12 21:24:47 UTC (rev 12682)
+++ CalendarServer/trunk/bin/_build.sh 2014-02-12 21:28:22 UTC (rev 12683)
</span><span class="lines">@@ -25,8 +25,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> using_system () {
</span><del>- local name="$1"; shift;
- echo_header "Using system version of ${name}.";
</del><ins>+ if "${do_setup}"; then
+ local name="$1"; shift;
+ echo_header "Using system version of ${name}.";
+ fi;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -471,11 +473,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> ruler () {
</span><del>- echo "____________________________________________________________";
- echo "";
</del><ins>+ if "${do_setup}"; then
+ echo "____________________________________________________________";
+ echo "";
</ins><span class="cx">
</span><del>- if [ $# -gt 0 ]; then
- echo "$@";
</del><ins>+ if [ $# -gt 0 ]; then
+ echo "$@";
+ fi;
</ins><span class="cx"> fi;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkbin_calendarserver_preamblepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_calendarserver_preamble.py (12682 => 12683)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_calendarserver_preamble.py 2014-02-12 21:24:47 UTC (rev 12682)
+++ CalendarServer/trunk/bin/_calendarserver_preamble.py 2014-02-12 21:28:22 UTC (rev 12683)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> home = dirname(dirname(abspath(__file__)))
</span><del>- run = join(home, "run")
</del><ins>+ run = join(home, join("bin", "run"))
</ins><span class="cx">
</span><span class="cx"> if not exists(run) or not exists(join(home, "setup.py")):
</span><span class="cx"> # This doesn't look enough like a development checkout; let's not
</span></span></pre></div>
<a id="CalendarServertrunkbinrun"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/run (12682 => 12683)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/run 2014-02-12 21:24:47 UTC (rev 12682)
+++ CalendarServer/trunk/bin/run 2014-02-12 21:28:22 UTC (rev 12683)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx"> echo " -s Run setup only; don't run server";
</span><span class="cx"> echo " -f Force setup to run";
</span><span class="cx"> echo " -n Do not run setup";
</span><del>- # echo " -p Print PYTHONPATH value for server and exit";
- # echo " -e Print =-separated environment variables required to run and exit";
</del><ins>+ echo " -p Print PYTHONPATH value for server and exit";
+ echo " -e Print =-separated environment variables required to run and exit";
</ins><span class="cx"> echo " -d Run caldavd as a daemon";
</span><span class="cx"> echo " -k Stop caldavd";
</span><span class="cx"> echo " -r Restart caldavd";
</span><span class="lines">@@ -91,6 +91,8 @@
</span><span class="cx"> # functions in build.sh.
</span><span class="cx"> parse_options () {
</span><span class="cx"> OPTIND=1;
</span><ins>+ print_path="false";
+ print_environment="false";
</ins><span class="cx"> while getopts "ahsfnpedkrK: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">@@ -105,13 +107,13 @@
</span><span class="cx"> 'K') read_key="${OPTARG}"; ;;
</span><span class="cx"> 'S') profile="-p ${OPTARG}"; ;;
</span><span class="cx"> 's') do_setup="true"; run="false"; ;;
</span><del>- # 'p')
- # do_get="false"; do_setup="false"; run="false"; print_path="true";
- # ;;
- # 'e')
- # do_get="false"; do_setup="false"; run="false"; print_path="true";
- # print_environment="true";
- # ;;
</del><ins>+ 'p')
+ do_get="false"; do_setup="false"; run="false"; print_path="true";
+ ;;
+ 'e')
+ do_get="false"; do_setup="false"; run="false"; print_path="true";
+ print_environment="true";
+ ;;
</ins><span class="cx"> # 'i')
</span><span class="cx"> # do_get="true";
</span><span class="cx"> # do_setup="true";
</span><span class="lines">@@ -216,6 +218,13 @@
</span><span class="cx"> exit $?;
</span><span class="cx"> fi;
</span><span class="cx">
</span><ins>+ # About to do something for real; let's enumerate (and depending on options,
+ # possibly download and/or install) the dependencies.
+
+ export _DEVELOP="true";
+
+ develop;
+
</ins><span class="cx"> if "${kill}" || "${restart}"; then
</span><span class="cx"> pidfile="$("${wd}/bin/calendarserver_config" "PIDFile")";
</span><span class="cx"> # Split key and value on "=" and just grab the value
</span><span class="lines">@@ -236,24 +245,17 @@
</span><span class="cx"> fi;
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- # About to do something for real; let's enumerate (and depending on options,
- # possibly download and/or install) the dependencies.
</del><ins>+ # 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
+ if "${print_environment}"; then
+ ${python} -c "import os; print repr(dict(os.environ))"
+ else
+ echo "${PYTHONPATH}";
+ fi;
+ exit 0;
+ fi;
</ins><span class="cx">
</span><del>- export _DEVELOP="true";
-
- develop;
-
- # # 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
- # if "${print_environment}"; then
- # "${PYTHON}" -c "import os; print repr(dict(os.environ))"
- # else
- # echo "${PYTHONPATH}";
- # fi;
- # exit 0;
- # fi;
-
</del><span class="cx"> # # If we're installing, install the calendar server itself.
</span><span class="cx"> # py_install "Calendar Server" "${wd}";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>