<!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>[14290] CalendarServer/trunk/bin/_build.sh</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/14290">14290</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-12 14:26:37 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Be more careful about declaring variables local.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.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 (14289 => 14290)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2015-01-12 22:26:16 UTC (rev 14289)
+++ CalendarServer/trunk/bin/_build.sh 2015-01-12 22:26:37 UTC (rev 14290)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> setup_print () {
</span><del>- what="$1"; shift;
</del><ins>+ local what="$1"; shift;
</ins><span class="cx">
</span><span class="cx"> PYTHONPATH="${wd}:${PYTHONPATH:-}" "${bootstrap_python}" - 2>/dev/null << EOF
</span><span class="cx"> from __future__ import print_function
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> local md5="";
</span><span class="cx"> local sha1="";
</span><span class="cx">
</span><del>- OPTIND=1;
</del><ins>+ local OPTIND=1;
</ins><span class="cx"> while getopts "m:s:" option; do
</span><span class="cx"> case "${option}" in
</span><span class="cx"> 'm') md5="${OPTARG}"; ;;
</span><span class="lines">@@ -193,9 +193,11 @@
</span><span class="cx"> fi;
</span><span class="cx"> if [ ! -d "${path}" ]; then
</span><span class="cx"> local ext="$(echo "${url}" | sed 's|^.*\.\([^.]*\)$|\1|')";
</span><ins>+ local decompress="";
+ local unpack="";
</ins><span class="cx">
</span><span class="cx"> untar () { tar -xvf -; }
</span><del>- unzipstream () { tmp="$(mktemp -t ccsXXXXX)"; cat > "${tmp}"; unzip "${tmp}"; rm "${tmp}"; }
</del><ins>+ unzipstream () { local tmp="$(mktemp -t ccsXXXXX)"; cat > "${tmp}"; unzip "${tmp}"; rm "${tmp}"; }
</ins><span class="cx"> case "${ext}" in
</span><span class="cx"> gz|tgz) decompress="gzip -d -c"; unpack="untar"; ;;
</span><span class="cx"> bz2) decompress="bzip2 -d -c"; unpack="untar"; ;;
</span><span class="lines">@@ -320,6 +322,8 @@
</span><span class="cx"> # Run 'make' with the given command line, prepending a -j option appropriate to
</span><span class="cx"> # the number of CPUs on the current machine, if that can be determined.
</span><span class="cx"> jmake () {
</span><ins>+ local ncpu="";
+
</ins><span class="cx"> case "$(uname -s)" in
</span><span class="cx"> Darwin|Linux)
</span><span class="cx"> ncpu="$(getconf _NPROCESSORS_ONLN)";
</span><span class="lines">@@ -349,7 +353,7 @@
</span><span class="cx"> local build_cmd="jmake";
</span><span class="cx"> local install_cmd="make install";
</span><span class="cx">
</span><del>- OPTIND=1;
</del><ins>+ local OPTIND=1;
</ins><span class="cx"> while getopts "m:s:c:p:b:" option; do
</span><span class="cx"> case "${option}" in
</span><span class="cx"> 'm') f_hash="-m ${OPTARG}"; ;;
</span><span class="lines">@@ -369,7 +373,7 @@
</span><span class="cx">
</span><span class="cx"> mkdir -p "${dep_sources}";
</span><span class="cx">
</span><del>- srcdir="${dep_sources}/${path}";
</del><ins>+ local srcdir="${dep_sources}/${path}";
</ins><span class="cx"> # local dstroot="${srcdir}/_root";
</span><span class="cx"> local dstroot="${dev_roots}/${name}";
</span><span class="cx">
</span><span class="lines">@@ -640,14 +644,14 @@
</span><span class="cx"> pip-1.5.6 \
</span><span class="cx"> virtualenv-1.11.6 \
</span><span class="cx"> ; do
</span><del>- name="${pkg%-*}";
- version="${pkg#*-}";
- first="$(echo "${name}" | sed 's|^\(.\).*$|\1|')";
- url="https://pypi.python.org/packages/source/${first}/${name}/${pkg}.tar.gz";
</del><ins>+ local name="${pkg%-*}";
+ local version="${pkg#*-}";
+ local first="$(echo "${name}" | sed 's|^\(.\).*$|\1|')";
+ local url="https://pypi.python.org/packages/source/${first}/${name}/${pkg}.tar.gz";
</ins><span class="cx">
</span><span class="cx"> ruler "Downloading ${pkg}";
</span><span class="cx">
</span><del>- tmp="$(mktemp -d -t ccsXXXXX)";
</del><ins>+ local tmp="$(mktemp -d -t ccsXXXXX)";
</ins><span class="cx">
</span><span class="cx"> curl -L "${url}" | tar -C "${tmp}" -xvzf -;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>