<!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>[151223] contrib/mp-buildbot/mpbb-install-dependencies</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="https://trac.macports.org/changeset/151223">151223</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-08-10 14:14:16 -0700 (Wed, 10 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mp-buildbot: proper quoting, typos, style improvements</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribmpbuildbotmpbbinstalldependencies">contrib/mp-buildbot/mpbb-install-dependencies</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribmpbuildbotmpbbinstalldependencies"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-install-dependencies (151222 => 151223)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-install-dependencies        2016-08-10 21:03:00 UTC (rev 151222)
+++ contrib/mp-buildbot/mpbb-install-dependencies        2016-08-10 21:14:16 UTC (rev 151223)
</span><span class="lines">@@ -20,13 +20,10 @@
</span><span class="cx"> return 1
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- # prepare the log file
- if ! [[ -d "${option_logdir}" ]] ; then
- mkdir -p "${option_logdir}"
- fi
- log_status_dependencies=${option_logdir}/dependencies-progress.txt
- # make ure to start with an empty file
- echo -n "" > $log_status_dependencies
</del><ins>+ # prepare the log file and make sure to start with an empty one
+ mkdir -p "${option_logdir}"
+ log_status_dependencies="${option_logdir}/dependencies-progress.txt"
+ > "$log_status_dependencies"
</ins><span class="cx">
</span><span class="cx"> # calculate list of dependencies in-order
</span><span class="cx"> dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}")
</span><span class="lines">@@ -44,10 +41,10 @@
</span><span class="cx"> dependencies_counter=1
</span><span class="cx">
</span><span class="cx"> echo "Installing $dependencies_count dependencies:"
</span><del>- echo "Installing $dependencies_count dependencies:" >> $log_status_dependencies
</del><ins>+ echo "Installing $dependencies_count dependencies:" >> "$log_status_dependencies"
</ins><span class="cx"> echo "$dependencies" | sed -E 's/^/ - /'
</span><del>- echo "$dependencies" | sed -E 's/^/ - /' >> $log_status_dependencies
- echo "" >> $log_status_dependencies
</del><ins>+ echo "$dependencies" | sed -E 's/^/ - /' >> "$log_status_dependencies"
+ echo >> "$log_status_dependencies"
</ins><span class="cx">
</span><span class="cx"> echo "$dependencies" | while read dependency; do
</span><span class="cx"> # Split portname +variant1+variant2 into portname and variants, where
</span><span class="lines">@@ -55,15 +52,15 @@
</span><span class="cx"> depname=${dependency%% *}
</span><span class="cx"> depvariants=${dependency:${#depname}+1}
</span><span class="cx">
</span><del>- text="Installing dependency ($dependencies_counter of $dependencies_count) '${depname}', variants: '${depvariants}'"
</del><ins>+ text="Installing dependency ($dependencies_counter of $dependencies_count) '${depname}' with variants '${depvariants}'"
</ins><span class="cx"> echo "----> ${text}"
</span><del>- echo -n "${text}' ... " >> $log_status_dependencies
</del><ins>+ echo -n "${text} ... " >> "$log_status_dependencies"
</ins><span class="cx"> if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants; then
</span><span class="cx"> echo "Build of dependency '${depname}' failed, aborting." >&2
</span><del>- echo " [FAIL]" >> $log_status_dependencies
</del><ins>+ echo " [FAIL]" >> "$log_status_dependencies"
</ins><span class="cx"> return 1
</span><span class="cx"> else
</span><del>- echo " [OK]" >> $log_status_dependencies
</del><ins>+ echo " [OK]" >> "$log_status_dependencies"
</ins><span class="cx"> dependencies_counter=$((dependencies_counter + 1))
</span><span class="cx"> fi
</span><span class="cx"> done
</span></span></pre>
</div>
</div>
</body>
</html>