<!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>[118831] 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/118831">118831</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-04-11 11:05:26 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>restore_ports: support macports 2.3</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 (118830 => 118831)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/restore_ports/restore_ports.tcl 2014-04-11 15:50:11 UTC (rev 118830)
+++ contrib/restore_ports/restore_ports.tcl 2014-04-11 18:05:26 UTC (rev 118831)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><del>-#!/usr/bin/tclsh
</del><ins>+#!/bin/sh
</ins><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><ins>+# \
+if /usr/bin/which -s port-tclsh; then exec port-tclsh "$0" -i `which port-tclsh` "$@"; else exec /usr/bin/tclsh "$0" "$@"; 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">@@ -12,10 +14,10 @@
</span><span class="cx"> set MY_VERSION 0.1
</span><span class="cx">
</span><span class="cx"> proc printUsage {} {
</span><del>- puts "Usage: $::argv0 \[-hV\] \[-t macports-tcl-path\] \[filename\]"
</del><ins>+ puts "Usage: $::argv0 \[-hV\] \[-p macports-prefix\] \[filename\]"
</ins><span class="cx"> puts " -h This help"
</span><del>- puts " -t Give a different location for the base MacPorts Tcl"
- puts " file (defaults to /Library/Tcl)"
</del><ins>+ puts " -p Use a different MacPorts prefix"
+ puts " (defaults to /opt/local)"
</ins><span class="cx"> puts " -V show version and MacPorts version being used"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -211,26 +213,29 @@
</span><span class="cx">
</span><span class="cx"> # Begin
</span><span class="cx">
</span><del>-set macportsTclPath "/Library/Tcl"
-if {![file isfile ${macportsTclPath}/macports1.0/macports_fastload.tcl]} {
- set macportsTclPath "/opt/local/share/macports/Tcl"
-}
</del><ins>+set macportsPrefix /opt/local
</ins><span class="cx"> set showVersion 0
</span><span class="cx">
</span><ins>+set origArgv $::argv
</ins><span class="cx"> while {[string index [lindex $::argv 0] 0] == "-" } {
</span><span class="cx"> switch [string range [lindex $::argv 0] 1 end] {
</span><span class="cx"> h {
</span><span class="cx"> printUsage
</span><span class="cx"> exit 0
</span><span class="cx"> }
</span><del>- t {
</del><ins>+ i {
+ set interp_path [lindex $::argv 1]
+ set ::argv [lrange $::argv 1 end]
+ }
+ p {
</ins><span class="cx"> if {[llength $::argv] < 2} {
</span><del>- puts "-t needs a path"
</del><ins>+ puts "-p needs a path"
</ins><span class="cx"> printUsage
</span><span class="cx"> exit 1
</span><span class="cx"> }
</span><del>- set macportsTclPath [lindex $::argv 1]
</del><ins>+ set macportsPrefix [lindex $::argv 1]
</ins><span class="cx"> set ::argv [lrange $::argv 1 end]
</span><ins>+ set userPrefix 1
</ins><span class="cx"> }
</span><span class="cx"> V {
</span><span class="cx"> set showVersion 1
</span><span class="lines">@@ -244,7 +249,27 @@
</span><span class="cx"> set ::argv [lrange $::argv 1 end]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-source ${macportsTclPath}/macports1.0/macports_fastload.tcl
</del><ins>+# check that default prefix exists
+if {![info exists userPrefix] && ![file isdirectory $macportsPrefix]} {
+ error "prefix '$macportsPrefix' does not exist; maybe you need to use the -p option?"
+}
+
+if {[info exists interp_path]} {
+ set prefixFromInterp [file dirname [file dirname $interp_path]]
+ # 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] <@stdin >@stdout 2>@stderr
+ } else {
+ exec /usr/bin/tclsh $argv0 {*}[lrange $origArgv 2 end] <@stdin >@stdout 2>@stderr
+ }
+ exit 0
+ }
+} else {
+ # older base version
+ source ${macportsPrefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
+}
+
</ins><span class="cx"> package require macports
</span><span class="cx"> package require Pextlib 1.0
</span><span class="cx"> umask 022
</span></span></pre>
</div>
</div>
</body>
</html>