[26532] trunk/base/portmgr/dmg/preflight

[source_changes at macosforge.org]

Revision: 26532
          http://trac.macosforge.org/projects/macports/changeset/26532
Author:   jmpp at macports.org
Date:     2007-06-27 15:33:16 -0700 (Wed, 27 Jun 2007)

Log Message:
-----------
Update script with proper syntax now, no more Makefile magic mixture.

Modified Paths:
--------------
    trunk/base/portmgr/dmg/preflight

Modified: trunk/base/portmgr/dmg/preflight
===================================================================
--- trunk/base/portmgr/dmg/preflight	2007-06-27 21:37:57 UTC (rev 26531)
+++ trunk/base/portmgr/dmg/preflight	2007-06-27 22:33:16 UTC (rev 26532)
@@ -57,17 +57,18 @@
     [ ! -d /opt/local/var/db/dports/${dir} ] || mv -v /opt/local/var/db/dports/${dir} /opt/local/var/macports
 done
 
-[ ! -d /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || { mkdir -vp \
-      /opt/local/var/macports/sources/rsync.macports.org/release && mv -v \
-        /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports /opt/local/var/macports/sources/rsync.macports.org/release/ports ; }
+[ ! -d /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || {
+    mkdir -vp /opt/local/var/macports/sources/rsync.macports.org/release && mv -v \
+        /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports /opt/local/var/macports/sources/rsync.macports.org/release/ports ;
+}
 
 for receipt in /opt/local/var/macports/receipts/*/*/receipt.bz2 ; do
-    [ ! \( -f ${receipt} -a ! -f ${receipt}.mpsaved \) ] || { cp -v ${receipt} ${receipt}.mpsaved && { \
+    [ ! \( -f ${receipt} -a ! -f ${receipt}.mpsaved \) ] || { cp -v ${receipt} ${receipt}.mpsaved && {
       bzip2 -q -dc ${receipt} | sed 's/db\/dports/macports/g' | bzip2 -q -zf > ${receipt}.new ;
-    } && mv -v ${receipt}.new ${receipt} ; \
+    } && mv -v ${receipt}.new ${receipt} ;
 }; done
 
-[ ! \( -f /opt/local/etc/macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
+[ ! \( -f /opt/local/etc/macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || {
   mv -v /opt/local/etc/macports/ports.conf /opt/local/etc/macports/macports.conf.mpsaved
   sed 's/etc\/ports/etc\/macports/g' /opt/local/etc/macports/macports.conf.mpsaved > /opt/local/etc/macports/macports.conf.tmp && \
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
@@ -89,7 +90,7 @@
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
 }
 
-[ ! \( -f /opt/local/etc/macports/sources.conf -a ! -f ${UPGRADECHECK} \) ] || { \
+[ ! \( -f /opt/local/etc/macports/sources.conf -a ! -f ${UPGRADECHECK} \) ] || {
   cp -v /opt/local/etc/macports/sources.conf /opt/local/etc/macports/sources.conf.mpsaved
   sed 's/darwinports/macports/g' /opt/local/etc/macports/sources.conf > /opt/local/etc/macports/sources.conf.tmp && \
     mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf
@@ -97,7 +98,7 @@
     mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf
 }
 
-[ ! \( -f ${HOME}/.macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
+[ ! \( -f ${HOME}/.macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || {
   mv -v ${HOME}/.macports/ports.conf ${HOME}/.macports/macports.conf.mpsaved
   sed 's/etc\/ports/etc\/macports/g' ${HOME}/.macports/macports.conf.mpsaved > ${HOME}/.macports/macports.conf.tmp && \
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
@@ -119,5 +120,7 @@
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
 }
 
-@[ -f ${UPGRADECHECK} ] || { echo ""; echo "MacPorts installation successfully upgraded from the old DarwinPorts namespace!"; echo "" \
-	echo "MacPorts rename update done!" > ${UPGRADECHECK} ; }
+[ -f ${UPGRADECHECK} ] || {
+    echo ""; echo "MacPorts installation successfully upgraded from the old DarwinPorts namespace!"; echo ""
+	echo "MacPorts rename update done!" > ${UPGRADECHECK} ;
+}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070627/dc65043a/attachment.html