Revision

31804

Author

wsiegrist@apple.com

Date

2007-12-07 19:14:52 -0800 (Fri, 07 Dec 2007)

Log Message

added explicit paths to rm and tclsh in order to run without a PATH.  PortIndex2MySQL.tcl now relies on tclsh being in /opt/local/bin

Modified Paths

• trunk/base/portmgr/jobs/PortIndex2MySQL.tcl
• trunk/base/portmgr/jobs/mprsyncup

Diff

--- trunk/base/portmgr/jobs/PortIndex2MySQL.tcl	2007-12-08 00:55:15 UTC (rev 31803)
+++ trunk/base/portmgr/jobs/PortIndex2MySQL.tcl	2007-12-08 03:14:52 UTC (rev 31804)
@@ -1,4 +1,4 @@
-#!/usr/bin/env tclsh
+#!/opt/local/bin/tclsh
 # -*- 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
 #
 # PortIndex2MySQL.tcl

--- trunk/base/portmgr/jobs/mprsyncup	2007-12-08 00:55:15 UTC (rev 31803)
+++ trunk/base/portmgr/jobs/mprsyncup	2007-12-08 03:14:52 UTC (rev 31804)
@@ -34,6 +34,7 @@
 # Commands we need:
 SVN="/opt/local/bin/svn -q --non-interactive"
 RSYNC="/usr/bin/rsync -q"
+RM="/bin/rm"
 
 # Paths we'll work on:
 SVNROOT=/var/tmp/macports
@@ -57,7 +58,7 @@
 if [ ! -d ${RSYNCROOT}/trunk/base ]; then
     mkdir -p ${RSYNCROOT}/trunk
 fi
-${RSYNC} -a -I --delete ${TBASE}-export/ ${RSYNCROOT}/trunk/base && rm -rf ${TBASE}-export
+${RSYNC} -a -I --delete ${TBASE}-export/ ${RSYNCROOT}/trunk/base && ${RM} -rf ${TBASE}-export
 
 
 # Read what tag we're releasing from, switch to/checkout a copy, export and rsync it to ${RSYNCROOT}/release/base:
@@ -75,7 +76,7 @@
 if [ ! -d ${RSYNCROOT}/release/base ]; then
     mkdir -p ${RSYNCROOT}/release/base
 fi
-${RSYNC} -a -I --delete ${RBASE}-export/ ${RSYNCROOT}/release/base && rm -rf ${RBASE}-export
+${RSYNC} -a -I --delete ${RBASE}-export/ ${RSYNCROOT}/release/base && ${RM} -rf ${RBASE}-export
 
 
 # Update/checkout the ports tree, export it and rsync it to ${RSYNCROOT}/release/ports:
@@ -88,18 +89,18 @@
 if [ ! -d ${RSYNCROOT}/release/ports ]; then
     mkdir -p ${RSYNCROOT}/release/ports
 fi
-${RSYNC} -a -I --delete ${PORTS}-export/ ${RSYNCROOT}/release/ports && rm -rf ${PORTS}-export
+${RSYNC} -a -I --delete ${PORTS}-export/ ${RSYNCROOT}/release/ports && ${RM} -rf ${PORTS}-export
 
 
 # Compatibility checks:
 cd ${RSYNCROOT}
 if [ ! -h dpupdate ]; then
-    rm -rf dpupdate && ln -s trunk dpupdate
+    ${RM} -rf dpupdate && ln -s trunk dpupdate
 fi
 if [ ! -h dpupdate1 ]; then
-    rm -rf dpupdate1 && ln -s release dpupdate1
+    ${RM} -rf dpupdate1 && ln -s release dpupdate1
 fi
 if [ ! -h trunk/dports ]; then
     cd trunk
-    rm -rf dports && ln -s ../release/ports dports
+    ${RM} -rf dports && ln -s ../release/ports dports
 fi