<!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>[134396] contrib/restore_ports/restore_ports.tcl</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/134396">134396</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-03-24 08:28:30 -0700 (Tue, 24 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>restore_ports: remove support for old base versions, and add some better error reporting</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#contribrestore_portsrestore_portstcl">contrib/restore_ports/restore_ports.tcl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribrestore_portsrestore_portstcl"></a>
<div class="modfile"><h4>Modified: contrib/restore_ports/restore_ports.tcl (134395 => 134396)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/restore_ports/restore_ports.tcl        2015-03-24 15:19:28 UTC (rev 134395)
+++ contrib/restore_ports/restore_ports.tcl        2015-03-24 15:28:30 UTC (rev 134396)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> #!/bin/sh
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # \
</span><del>-if /usr/bin/which -s port-tclsh; then exec port-tclsh &quot;$0&quot; -i `which port-tclsh` &quot;$@&quot;; else exec /usr/bin/tclsh &quot;$0&quot; &quot;$@&quot;; fi
</del><ins>+if /usr/bin/which -s port-tclsh; then exec port-tclsh &quot;$0&quot; -i `which port-tclsh` &quot;$@&quot;; else exec /usr/bin/tclsh &quot;$0&quot; -i /usr/bin/tclsh &quot;$@&quot;; fi
</ins><span class="cx"> #
</span><span class="cx"> # Install a list of ports given in the form produced by 'port installed', in
</span><span class="cx"> # correct dependency order so as to preserve the selected variants.
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">    array set portInfo [lindex $portSearchResult 1]
</span><span class="cx">    if {[catch {set mport [mportopen $portInfo(porturl) [list subport $portInfo(name)] $variantInfo]} result]} {
</span><span class="cx">       global errorInfo
</span><del>-      puts &quot;$errorInfo&quot;
</del><ins>+      puts stderr &quot;$errorInfo&quot;
</ins><span class="cx">       return -code error &quot;Unable to open port '$portName': $result&quot;
</span><span class="cx">    }
</span><span class="cx">    array unset portInfo
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">         
</span><span class="cx">         if {[catch {set workername [mportopen $porturl [list subport $portinfo(name)] $variations]} result]} {
</span><span class="cx">             global errorInfo
</span><del>-            puts &quot;$errorInfo&quot;
</del><ins>+            puts stderr &quot;$errorInfo&quot;
</ins><span class="cx">             return -code error &quot;Unable to open port '$name': $result&quot;
</span><span class="cx">         }
</span><span class="cx">         if {[catch {set result [mportexec $workername $install_target]} result]} {
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">       }
</span><span class="cx">       p {
</span><span class="cx">          if {[llength $::argv] &lt; 2} {
</span><del>-            puts &quot;-p needs a path&quot;
</del><ins>+            puts stderr &quot;-p needs a path&quot;
</ins><span class="cx">             printUsage
</span><span class="cx">             exit 1
</span><span class="cx">          }
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx">          set showVersion 1
</span><span class="cx">       }
</span><span class="cx">       default {
</span><del>-         puts &quot;Unknown option [lindex $::argv 0]&quot;
</del><ins>+         puts stderr &quot;Unknown option [lindex $::argv 0]&quot;
</ins><span class="cx">          printUsage
</span><span class="cx">          exit 1
</span><span class="cx">       }
</span><span class="lines">@@ -256,18 +256,21 @@
</span><span class="cx"> 
</span><span class="cx"> if {[info exists interp_path]} {
</span><span class="cx">     set prefixFromInterp [file dirname [file dirname $interp_path]]
</span><del>-    # make sure we're running in the port-tclsh associated with the correct prefix
-    if {$prefixFromInterp ne $macportsPrefix} {
-        if {[file executable ${macportsPrefix}/bin/port-tclsh]} {
-            exec ${macportsPrefix}/bin/port-tclsh $argv0 -i ${macportsPrefix}/bin/port-tclsh {*}[lrange $origArgv 2 end] &lt;@stdin &gt;@stdout 2&gt;@stderr
-        } else {
-            exec /usr/bin/tclsh $argv0 {*}[lrange $origArgv 2 end] &lt;@stdin &gt;@stdout 2&gt;@stderr
-        }
</del><ins>+} else {
+    # presumably the user ran '/some/prefix/bin/port-tclsh restore_ports.tcl'
+    set prefixFromInterp &quot;&quot;
+    if {[info exists userPrefix]} {
+        error &quot;the -p option cannot be used when running with an explicit interpreter (e.g. 'port-tclsh restore_ports.tcl') - run just './restore_ports.tcl' instead.&quot;
+    }
+}
+# make sure we're running in the port-tclsh associated with the correct prefix
+if {$prefixFromInterp ne &quot;&quot; &amp;&amp; $prefixFromInterp ne $macportsPrefix} {
+    if {[file executable ${macportsPrefix}/bin/port-tclsh]} {
+        exec ${macportsPrefix}/bin/port-tclsh $argv0 -i ${macportsPrefix}/bin/port-tclsh {*}[lrange $origArgv 2 end] &lt;@stdin &gt;@stdout 2&gt;@stderr
</ins><span class="cx">         exit 0
</span><ins>+    } else {
+        error &quot;prefix '$macportsPrefix' does not appear to have a working port-tclsh&quot;
</ins><span class="cx">     }
</span><del>-} else {
-    # older base version
-    source ${macportsPrefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> package require macports
</span></span></pre>
</div>
</div>

</body>
</html>