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

[jmpp at macports.org]

Revision: 31941
          http://trac.macosforge.org/projects/macports/changeset/31941
Author:   jmpp at macports.org
Date:     2007-12-12 07:45:32 -0800 (Wed, 12 Dec 2007)

Log Message:
-----------

Include the quotes to guard against possible embedded whitespace in the $HOME variable fix for the dp2mp-move
upgrade code into the pkg's preflight script, meant to take care of such upgrade on behalf of the binary installer.
Refs #13145.

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

Modified: trunk/base/portmgr/dmg/preflight
===================================================================
--- trunk/base/portmgr/dmg/preflight	2007-12-12 15:28:55 UTC (rev 31940)
+++ trunk/base/portmgr/dmg/preflight	2007-12-12 15:45:32 UTC (rev 31941)
@@ -96,24 +96,24 @@
     mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf
 }
 
-[ ! \( -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
-  sed 's/db\/dports/macports/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-  sed 's/darwinports/macports/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-  sed 's/dpupdate1\/base/release\/base/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-  sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-  sed '/^rsync_options/s/"\(.*\)"/\1/' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-  sed 's/ --delete / /' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-  sed 's/ ports.conf(5)/ macports.conf(5)/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+[ ! \( -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"
+  sed 's/db\/dports/macports/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \
+    mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf"
+  sed 's/darwinports/macports/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \
+    mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf"
+  sed 's/dpupdate1\/base/release\/base/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \
+    mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf"
+  sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \
+    mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf"
+  sed '/^rsync_options/s/"\(.*\)"/\1/' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \
+    mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf"
+  sed 's/ --delete / /' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \
+    mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf"
+  sed 's/ ports.conf(5)/ macports.conf(5)/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \
+    mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf"
 }
 
 [ -f ${UPGRADECHECK} ] || {

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