[71442] contrib/mpab

[jmr at macports.org]

Revision: 71442
          http://trac.macports.org/changeset/71442
Author:   jmr at macports.org
Date:     2010-09-13 01:26:47 -0700 (Mon, 13 Sep 2010)
Log Message:
-----------
mpab: syntax

Modified Paths:
--------------
    contrib/mpab/mpab
    contrib/mpab/mpab-functions

Modified: contrib/mpab/mpab
===================================================================
--- contrib/mpab/mpab	2010-09-13 06:45:38 UTC (rev 71441)
+++ contrib/mpab/mpab	2010-09-13 08:26:47 UTC (rev 71442)
@@ -61,7 +61,7 @@
 # option parsing
 OSMajor=`uname -r | sed 's/\..*//'`
 # xcodebuild breaks in chroots on 10.6
-if [[ $1 = "-n" -o $OSMajor -ge 10 ]]; then
+if [[ $1 = "-n" || $OSMajor -ge 10 ]]; then
     chrootPath=""
     echo "Warning: not using chroot"
     if [[ $1 = "-n" ]]; then
@@ -95,7 +95,7 @@
 fi
 
 if [[ ${command} == "umount" ]]; then
-   umountChroot ${chrootPath}
+   umountChroot "${chrootPath}"
    exit 0
 fi
 
@@ -129,13 +129,13 @@
       fi
       
       if [[ -n ${installPackage} ]]; then
-         buildMacPorts ${baseDir} ${dataDir} ${chrootPath} ${installPackage} ||
+         buildMacPorts ${baseDir} ${dataDir} "${chrootPath}" ${installPackage} ||
             ( echo "Failed to build MacPorts from release archive" && exit 1 )
       elif [[ -d ${MP_SVN_WORKDIR} ]]; then
-         buildMacPorts ${baseDir} ${dataDir} ${chrootPath} ${MP_SVN_WORKDIR} ||
+         buildMacPorts ${baseDir} ${dataDir} "${chrootPath}" ${MP_SVN_WORKDIR} ||
             ( echo "Failed to build MacPorts from SVN checkout directory (MP_SVN_WORKDIR)" && exit 1 )
       else
-         buildMacPorts ${baseDir} ${dataDir} ${chrootPath} ${MPTARBALL} ||
+         buildMacPorts ${baseDir} ${dataDir} "${chrootPath}" ${MPTARBALL} ||
             ( echo "Failed to build MacPorts from ${mpExport}" && exit 1 )
       fi
 
@@ -145,7 +145,7 @@
             cp -p ${portlistFile} ${chrootPath}/private/var/tmp/portlist
          fi
          exitMessage="Stopping..."
-         buildPorts ${baseDir} ${chrootPath}
+         buildPorts ${baseDir} "${chrootPath}"
          exitMessage=""
       fi
    fi

Modified: contrib/mpab/mpab-functions
===================================================================
--- contrib/mpab/mpab-functions	2010-09-13 06:45:38 UTC (rev 71441)
+++ contrib/mpab/mpab-functions	2010-09-13 08:26:47 UTC (rev 71442)
@@ -91,7 +91,7 @@
       echo $exitMessage
    fi
    if [[ -d ${chrootPath}/var/tmp/portresults/fail ]]; then
-      moveAndReport ${baseDir} ${chrootPath}
+      moveAndReport ${baseDir} "${chrootPath}"
    fi
    if [[ -n "$chrootPath" && -d ${chrootPath} ]]; then
       umountChroot ${chrootPath}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100913/7c223166/attachment.html>