<!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>[13737] 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/13737">13737</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 10:01:13 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make more happy on POSIX shell</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunkbin_pysh">CalendarServer/trunk/bin/_py.sh</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 (13736 => 13737)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2014-07-09 00:54:03 UTC (rev 13736)
+++ CalendarServer/trunk/bin/_build.sh 2014-07-09 17:01:13 UTC (rev 13737)
</span><span class="lines">@@ -121,34 +121,34 @@
</span><span class="cx">
</span><span class="cx"> hash="";
</span><span class="cx">
</span><del>- if type -ft openssl > /dev/null; then
</del><ins>+ if find_cmd openssl > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p openssl)" dgst -md5 "$@"; }
- elif type -ft md5 > /dev/null; then
</del><ins>+ md5 () { "$(find_cmd openssl)" dgst -md5 "$@"; }
+ elif find_cmd md5 > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p md5)" "$@"; }
- elif type -ft md5sum > /dev/null; then
</del><ins>+ md5 () { "$(find_cmd md5)" "$@"; }
+ elif find_cmd md5sum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p md5sum)" "$@"; }
</del><ins>+ md5 () { "$(find_cmd md5sum)" "$@"; }
</ins><span class="cx"> fi;
</span><span class="cx">
</span><del>- if type -ft sha1sum > /dev/null; then
</del><ins>+ if find_cmd sha1sum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="sha1sum"; fi;
</span><del>- sha1 () { "$(type -p sha1sum)" "$@"; }
</del><ins>+ sha1 () { "$(find_cmd sha1sum)" "$@"; }
</ins><span class="cx"> fi;
</span><del>- if type -ft shasum > /dev/null; then
</del><ins>+ if find_cmd shasum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="sha1"; fi;
</span><del>- sha1 () { "$(type -p shasum)" "$@"; }
</del><ins>+ sha1 () { "$(find_cmd shasum)" "$@"; }
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> if [ "${hash}" = "sha1" ]; then
</span><span class="cx"> hash () { sha1 "$@"; }
</span><span class="cx"> elif [ "${hash}" = "md5" ]; then
</span><span class="cx"> hash () { md5 "$@"; }
</span><del>- elif type -t cksum > /dev/null; then
</del><ins>+ elif find_cmd cksum > /dev/null; then
</ins><span class="cx"> hash="hash";
</span><span class="cx"> hash () { cksum "$@" | cut -f 1 -d " "; }
</span><del>- elif type -t sum > /dev/null; then
</del><ins>+ elif find_cmd sum > /dev/null; then
</ins><span class="cx"> hash="hash";
</span><span class="cx"> hash () { sum "$@" | cut -f 1 -d " "; }
</span><span class="cx"> else
</span></span></pre></div>
<a id="CalendarServertrunkbin_pysh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_py.sh (13736 => 13737)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_py.sh 2014-07-09 00:54:03 UTC (rev 13736)
+++ CalendarServer/trunk/bin/_py.sh 2014-07-09 17:01:13 UTC (rev 13737)
</span><span class="lines">@@ -15,6 +15,18 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+find_cmd () {
+ local cmd="$1"; shift;
+
+ local path="$(type "${cmd}" 2>/dev/null | sed "s|^${cmd} is \(a tracked alias for \)\{0,1\}||")";
+
+ if [ -z "${cmd}" ]; then
+ return 1;
+ fi;
+
+ echo "${path}";
+}
+
</ins><span class="cx"> # Echo the major.minor version of the given Python interpreter.
</span><span class="cx">
</span><span class="cx"> py_version () {
</span><span class="lines">@@ -38,7 +50,7 @@
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> local py_version="$(py_version "${python}")";
</span><del>- if [ "${py_version/./}" -lt "25" ]; then
</del><ins>+ if [ "$(echo "${py_version}" | sed 's|\.||')" -lt "25" ]; then
</ins><span class="cx"> return 1;
</span><span class="cx"> fi;
</span><span class="cx"> return 0;
</span><span class="lines">@@ -72,7 +84,7 @@
</span><span class="cx"> "/sw/bin/python${v}" \
</span><span class="cx"> ;
</span><span class="cx"> do
</span><del>- if p="$(type -p "${p}")"; then
</del><ins>+ if p="$(find_cmd "${p}")"; then
</ins><span class="cx"> if try_python "${p}"; then
</span><span class="cx"> echo "${p}";
</span><span class="cx"> return 0;
</span><span class="lines">@@ -148,7 +160,7 @@
</span><span class="cx"> # the part of the PostgreSQL build process which builds pl_python. Note that
</span><span class="cx"> # detect_python_version, above, already honors $PYTHON, so if this is already
</span><span class="cx"> # set it won't be stomped on, it will just be re-set to the same value.
</span><del>- export PYTHON="$(type -p ${bootstrap_python})";
</del><ins>+ export PYTHON="$(find_cmd ${bootstrap_python})";
</ins><span class="cx">
</span><span class="cx"> if [ -z "${bootstrap_python:-}" ]; then
</span><span class="cx"> echo "No suitable python found. Python 2.6 or 2.7 is required.";
</span></span></pre>
</div>
</div>
</body>
</html>