<!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>[118569] trunk/base/portmgr/dmg/postflight.in</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/118569">118569</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-04-04 16:42:16 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base dmg postflight: clean up after installing</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseportmgrdmgpostflightin">trunk/base/portmgr/dmg/postflight.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseportmgrdmgpostflightin"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/dmg/postflight.in (118568 => 118569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/dmg/postflight.in 2014-04-04 23:23:20 UTC (rev 118568)
+++ trunk/base/portmgr/dmg/postflight.in 2014-04-04 23:42:16 UTC (rev 118569)
</span><span class="lines">@@ -44,16 +44,17 @@
</span><span class="cx"> SBINPATH=${PREFIX}/sbin
</span><span class="cx"> CONFIGPATH=${PREFIX}/etc/macports
</span><span class="cx"> MANPAGES=${PREFIX}/share/man
</span><del>-MACPORTS_TCL_DIR=${PREFIX}/share/macports/Tcl
-REG1DIR=${MACPORTS_TCL_DIR}/registry1.0
</del><span class="cx"> DSCL=/usr/bin/dscl
</span><span class="cx"> RUNUSR=macports
</span><span class="cx"> TCLSH=@TCLSH@
</span><del>-TCL_PACKAGE_DIR=/Library/Tcl
</del><ins>+TCL_PACKAGE_PATH=@TCL_PACKAGE_PATH@
</ins><span class="cx"> TIMESTAMP=$(date +"%Y-%m-%d_at_%H:%M:%S")
</span><span class="cx"> BACKUP_SUFFIX=macports-saved_${TIMESTAMP}
</span><span class="cx"> OUR_STRING="MacPorts Installer addition on ${TIMESTAMP}"
</span><span class="cx">
</span><ins>+OLD_MACPORTS_TCL_DIR=${PREFIX}/share/macports/Tcl
+OLD_TCL_PACKAGE_DIR=/Library/Tcl
+
</ins><span class="cx"> # Create config files from defaults if not present
</span><span class="cx"> function setup_configs {
</span><span class="cx"> for f in archive_sites.conf macports.conf pubkeys.conf sources.conf variants.conf ; do
</span><span class="lines">@@ -73,8 +74,8 @@
</span><span class="cx"> ${TCLSH} ${SCRIPT_DIR}/upgrade_sources_conf_default.tcl ${PREFIX}
</span><span class="cx"> # Convert image directories (and direct mode installs) to image archives
</span><span class="cx"> echo "Updating port image format..."
</span><del>- ${TCLSH} ${SCRIPT_DIR}/images_to_archives.tcl ${MACPORTS_TCL_DIR}
- ${TCLSH} ${SCRIPT_DIR}/dedup_portfiles.tcl ${MACPORTS_TCL_DIR}
</del><ins>+ ${TCLSH} ${SCRIPT_DIR}/images_to_archives.tcl
+ ${TCLSH} ${SCRIPT_DIR}/dedup_portfiles.tcl
</ins><span class="cx">
</span><span class="cx"> echo "Synchronizing the MacPorts installation with the project's rsync server..."
</span><span class="cx"> if ! ${BINPATH}/port -v selfupdate; then
</span><span class="lines">@@ -117,27 +118,24 @@
</span><span class="cx"> echo -e "Done.\n"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Delete the old registry1.0 directory
-function delete_reg1 {
- if [[ -d ${REG1DIR} ]]; then
- rm -vrf ${REG1DIR}
</del><ins>+# delete macports1.0 link from old tcl package dir
+function delete_old_tcl_package_link {
+ # delete old link if present
+ if [[ -e "${OLD_TCL_PACKAGE_DIR}/macports1.0" ]]; then
+ rm -vrf "${OLD_TCL_PACKAGE_DIR}/macports1.0"
+ fi
+
+ # delete old macports1.0 link from new tcl package dir if present
+ if [[ -L "${TCL_PACKAGE_PATH}/macports1.0" ]]; then
+ rm -vrf "${TCL_PACKAGE_PATH}/macports1.0"
</ins><span class="cx"> fi
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# link macports1.0 into tcl package dir if possible
-function link_tcl_package {
- # delete old directory if present
- if [[ ! -L "${TCL_PACKAGE_DIR}/macports1.0" ]]; then
- if [[ ! -e "${TCL_PACKAGE_DIR}" ]]; then
- /usr/bin/install -d "${TCL_PACKAGE_DIR}" || true
- fi
- if [[ -d "${TCL_PACKAGE_DIR}/macports1.0" ]]; then
- rm -vrf "${TCL_PACKAGE_DIR}/macports1.0" || true
- fi
- if [[ ! -e "${TCL_PACKAGE_DIR}/macports1.0" && -d "${TCL_PACKAGE_DIR}" ]]; then
- ln -vs "${MACPORTS_TCL_DIR}/macports1.0" "${TCL_PACKAGE_DIR}/macports1.0" || true
- fi
- fi
</del><ins>+# delete the old tcl package location in share/macports/Tcl
+function delete_old_tcl_packages {
+ if [[ -d "${OLD_MACPORTS_TCL_DIR}" ]]; then
+ rm -vrf "${OLD_MACPORTS_TCL_DIR}"
+ fi
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # create the user to use for privilege dropping
</span><span class="lines">@@ -190,12 +188,11 @@
</span><span class="cx"> create_run_user
</span><span class="cx"> # Set up config files
</span><span class="cx"> setup_configs
</span><del>-# link macports1.0 pkg
-link_tcl_package
</del><span class="cx">
</span><span class="cx"> # Remove old stuff
</span><span class="cx"> cleanup_man
</span><del>-delete_reg1
</del><ins>+delete_old_tcl_package_link
+delete_old_tcl_packages
</ins><span class="cx">
</span><span class="cx"> # Determine the user's shell, in order to choose an appropriate configuration file we'll be tweaking.
</span><span class="cx"> # Exit nicely if the shell is any other than bash or tcsh, as that's considered non-standard.
</span></span></pre>
</div>
</div>
</body>
</html>