Revision
74011
Author
jmr@macports.org
Date
2010-12-01 16:22:08 -0800 (Wed, 01 Dec 2010)

Log Message

allow for mktemp not in /usr/bin when upgrading sources.conf

Modified Paths

Diff

Modified: trunk/base/src/upgrade_sources_conf_default.tcl (74010 => 74011)


--- trunk/base/src/upgrade_sources_conf_default.tcl	2010-12-01 23:44:15 UTC (rev 74010)
+++ trunk/base/src/upgrade_sources_conf_default.tcl	2010-12-02 00:22:08 UTC (rev 74011)
@@ -22,8 +22,15 @@
    exit 0
 }
 
+if {[file executable /usr/bin/mktemp]} {
+    set mktemp /usr/bin/mktemp
+} elseif {[file executable /bin/mktemp]} {
+    set mktemp /bin/mktemp
+} else {
+    set mktemp mktemp
+}
 
-set mktempChannel [open "|/usr/bin/mktemp -t macports_sources_upgrade.XXXXXXXXXX" r]
+set mktempChannel [open "|$mktemp -t macports_sources_upgrade.XXXXXXXXXX" r]
 set tempfile [read -nonewline $mktempChannel]
 close $mktempChannel