<!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>[135069] trunk/base/portmgr/jobs/mirror_macports.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="https://trac.macports.org/changeset/135069">135069</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-04-14 13:36:11 -0700 (Tue, 14 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: portmgr/jobs/mirror_macports.sh: fix variant extraction code and loops
I'm not sure if this script is actively being used, but it certainly didn't
correctly extract variants (it ran, e.g. port mirror collectd +[+]ntpd).
Additionally, a loop over a quoted string in bash does not tokenize the
contents of the string and loop over the tokens, but loops over the whole thing
at once, so let's remove the quotes where we don't really want them.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseportmgrjobsmirror_macportssh">trunk/base/portmgr/jobs/mirror_macports.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseportmgrjobsmirror_macportssh"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/jobs/mirror_macports.sh (135068 => 135069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/jobs/mirror_macports.sh 2015-04-14 20:34:15 UTC (rev 135068)
+++ trunk/base/portmgr/jobs/mirror_macports.sh 2015-04-14 20:36:11 UTC (rev 135069)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> $PORT mirror $P;
</span><span class="cx">
</span><span class="cx"> # for each variant
</span><del>- for V in `$PORT -q variants $P | $CUT -d " " -f 1 | $CUT -d ":" -f 1 | $GREP -v universal | $XARGS`;
</del><ins>+ for V in `$PORT -q variants $P | $CUT -c 4- | $CUT -d ":" -f 1 | $GREP -v universal | $XARGS`;
</ins><span class="cx"> do
</span><span class="cx"> # mirror with each variant
</span><span class="cx"> echo "Mirroring ${P} +${V}";
</span><span class="lines">@@ -50,15 +50,15 @@
</span><span class="cx"> done
</span><span class="cx">
</span><span class="cx"> # mirror with each platform (can exclude the one the server is running)
</span><del>- for VERS in "8 9";
</del><ins>+ for VERS in 8 9;
</ins><span class="cx"> do
</span><del>- for ARCH in "i386 powerpc";
</del><ins>+ for ARCH in i386 powerpc;
</ins><span class="cx"> do
</span><span class="cx"> echo "Mirroring ${P} with platform darwin ${VERS} ${ARCH}"
</span><span class="cx"> $PORT mirror $P os.platform=darwin os.subplatform=macosx os.major=${VERS} os.arch=${ARCH}
</span><span class="cx"> done
</span><span class="cx"> done
</span><del>- for VERS in "10 11 12 13 14";
</del><ins>+ for VERS in 10 11 12 13 14;
</ins><span class="cx"> do
</span><span class="cx"> echo "Mirroring ${P} with platform darwin ${VERS} i386"
</span><span class="cx"> $PORT mirror $P os.platform=darwin os.subplatform=macosx os.major=${VERS} os.arch=i386
</span></span></pre>
</div>
</div>
</body>
</html>