<!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>[12944] 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/12944">12944</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 12:07:58 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>/bin/sh
offset=2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbincaldavd">CalendarServer/trunk/bin/caldavd</a></li>
<li><a href="#CalendarServertrunkbindevelop">CalendarServer/trunk/bin/develop</a></li>
<li><a href="#CalendarServertrunkbinenvironment">CalendarServer/trunk/bin/environment</a></li>
<li><a href="#CalendarServertrunkbininstall_pip">CalendarServer/trunk/bin/install_pip</a></li>
<li><a href="#CalendarServertrunkbinpyflakes">CalendarServer/trunk/bin/pyflakes</a></li>
<li><a href="#CalendarServertrunkbinpython">CalendarServer/trunk/bin/python</a></li>
<li><a href="#CalendarServertrunkbinrun">CalendarServer/trunk/bin/run</a></li>
<li><a href="#CalendarServertrunkbinsim">CalendarServer/trunk/bin/sim</a></li>
<li><a href="#CalendarServertrunkbintest">CalendarServer/trunk/bin/test</a></li>
<li><a href="#CalendarServertrunkbintestserver">CalendarServer/trunk/bin/testserver</a></li>
<li><a href="#CalendarServertrunkbintrial">CalendarServer/trunk/bin/trial</a></li>
<li><a href="#CalendarServertrunkbintwistd">CalendarServer/trunk/bin/twistd</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbincaldavd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/caldavd (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/caldavd 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/caldavd 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-#!/usr/bin/env bash
</del><ins>+#!/bin/sh
</ins><span class="cx"> # -*- sh-basic-offset: 2 -*-
</span><span class="cx">
</span><span class="cx"> ##
</span></span></pre></div>
<a id="CalendarServertrunkbindevelop"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/develop (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/develop 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/develop 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbinenvironment"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/environment (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/environment 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/environment 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbininstall_pip"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/install_pip (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/install_pip 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/install_pip 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2013-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbinpyflakes"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/pyflakes (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/pyflakes 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/pyflakes 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbinpython"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/python (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/python 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/python 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbinrun"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/run (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/run 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/run 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-#!/usr/bin/env bash
</del><ins>+#!/bin/sh
</ins><span class="cx"> # -*- sh-basic-offset: 2 -*-
</span><span class="cx">
</span><span class="cx"> ##
</span><span class="lines">@@ -110,10 +110,10 @@
</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";
- ;;
</del><ins>+ # '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">@@ -218,6 +218,10 @@
</span><span class="cx"> exit $?;
</span><span class="cx"> fi;
</span><span class="cx">
</span><ins>+ if "${print_path}"; then
+ exec "${wd}/bin/environment" PYTHONPATH;
+ fi;
+
</ins><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><span class="lines">@@ -245,17 +249,6 @@
</span><span class="cx"> fi;
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- # 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>
<a id="CalendarServertrunkbinsim"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/sim (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/sim 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/sim 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbintest"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/test (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/test 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/test 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbintestserver"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/testserver (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/testserver 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/testserver 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><del>-#!/usr/bin/env bash
</del><ins>+#!/bin/sh
+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbintrial"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/trial (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/trial 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/trial 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunkbintwistd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/twistd (12943 => 12944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/twistd 2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/twistd 2014-03-18 19:07:58 UTC (rev 12944)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> #!/bin/sh
</span><ins>+# -*- sh-basic-offset: 2 -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</span></span></pre>
</div>
</div>
</body>
</html>