<!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>[121669] trunk/base/portmgr/jobs/PortIndex2MySQL.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/121669">121669</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-07-03 17:15:08 -0700 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>improve user-friendliness of PortIndex2MySQL.tcl</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseportmgrjobsPortIndex2MySQLtcl">trunk/base/portmgr/jobs/PortIndex2MySQL.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseportmgrjobsPortIndex2MySQLtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/jobs/PortIndex2MySQL.tcl (121668 => 121669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/jobs/PortIndex2MySQL.tcl 2014-07-03 22:45:51 UTC (rev 121668)
+++ trunk/base/portmgr/jobs/PortIndex2MySQL.tcl 2014-07-04 00:15:08 UTC (rev 121669)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-#!@TCLSH@
</del><ins>+#!/opt/local/bin/port-tclsh
</ins><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> #
</span><span class="cx"> # PortIndex2MySQL.tcl
</span><span class="lines">@@ -58,18 +58,31 @@
</span><span class="cx"> #####
</span><span class="cx">
</span><span class="cx">
</span><ins>+# Configuration variables. Fill in the blank strings.
+#
+# Email addresses that get failure notifications - e.g. "admin@macosforge.org"
+set SPAM_LOVERS ""
+# File to read the db password from - e.g. "/var/macports/script_data"
+set passwdfile ""
+# Database abstraction variables:
+# name of the mysql executable
+set mysql_exe "mysql"
+# path where the mysql executable is located (only needed if not in the default PATH)
+set mysql_exe_path ""
+set sqlfile "/tmp/portsdb.sql"
+set portsdb_host localhost
+set portsdb_name macports
+set portsdb_user macports
</ins><span class="cx">
</span><del>-# Runtime information log file and reciepient.
</del><ins>+# Runtime information log file and recipient.
</ins><span class="cx"> set runlog "/tmp/portsdb.log"
</span><span class="cx"> set runlog_fd [open $runlog w+]
</span><span class="cx"> set lockfile "/tmp/portsdb.lock"
</span><span class="cx"> set mailprog "/usr/sbin/sendmail"
</span><span class="cx"> set DATE [clock format [clock seconds] -format "%A %Y-%m-%d at %T"]
</span><span class="cx">
</span><del>-#set SPAM_LOVERS example@hostname.com
-
</del><span class="cx"> set SUBJECT "PortIndex2MySQL run failure on $DATE"
</span><del>-set FROM macports-mgr@lists.macosforge.org
</del><ins>+set FROM noreply@macports.org
</ins><span class="cx"> set HEADERS "To: $SPAM_LOVERS\r\nFrom: $FROM\r\nSubject: $SUBJECT\r\n\r\n"
</span><span class="cx">
</span><span class="cx"> # handle command line arguments
</span><span class="lines">@@ -141,6 +154,12 @@
</span><span class="cx">
</span><span class="cx"> # Procedure to catch the database password from a protected file.
</span><span class="cx"> proc getpasswd {passwdfile} {
</span><ins>+ if {$passwdfile eq ""} {
+ global lockfile lockfile_fd
+ ui_error "passwdfile is empty, did you forget to set it?"
+ cleanup lockfile
+ terminate 1
+ }
</ins><span class="cx"> if {[catch {open $passwdfile r} passwdfile_fd]} {
</span><span class="cx"> global lockfile lockfile_fd
</span><span class="cx"> ui_error "${::errorCode}: $passwdfile_fd"
</span><span class="lines">@@ -197,14 +216,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-# Database abstraction variables:
-set sqlfile "/tmp/portsdb.sql"
-set portsdb_host localhost
-set portsdb_name macports
-set portsdb_user macports
-set passwdfile "/opt/local/share/macports/resources/portmgr/password_file"
</del><span class="cx"> set portsdb_passwd [getpasswd $passwdfile]
</span><del>-set portsdb_cmd [macports::findBinary mysql5]
</del><ins>+set portsdb_cmd [macports::findBinary $mysql_exe $mysql_exe_path]
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Flat text file to which sql statements are written.
</span></span></pre>
</div>
</div>
</body>
</html>