[121311] trunk/base/portmgr/dmg/postflight.in

[jmr at macports.org]

Revision: 121311
          https://trac.macports.org/changeset/121311
Author:   jmr at macports.org
Date:     2014-06-23 03:00:52 -0700 (Mon, 23 Jun 2014)
Log Message:
-----------
quote PATH and MANPATH values in postflight script (#43798)

Modified Paths:
--------------
    trunk/base/portmgr/dmg/postflight.in

Modified: trunk/base/portmgr/dmg/postflight.in
===================================================================
--- trunk/base/portmgr/dmg/postflight.in	2014-06-23 09:22:52 UTC (rev 121310)
+++ trunk/base/portmgr/dmg/postflight.in	2014-06-23 10:00:52 UTC (rev 121311)
@@ -36,10 +36,10 @@
 #set -x
 
 # Script identification ('cause more often than not the svn Id is not expanded):
-VERSION=2.3.0
+VERSION=2.3.1
 
 # Abstraction variables:
-PREFIX=__PREFIX__
+PREFIX=@prefix@
 BINPATH=${PREFIX}/bin
 SBINPATH=${PREFIX}/sbin
 CONFIGPATH=${PREFIX}/etc/macports
@@ -240,7 +240,7 @@
 if ${SHELL} ${LOGIN_FLAG} -c "/usr/bin/printenv PATH" | grep ${PREFIX} > /dev/null; then
     echo "Your shell already has the right PATH environment variable for use with MacPorts!"
 else
-    write_setting PATH "${BINPATH}:${SBINPATH}:\$PATH"
+    write_setting PATH "\"${BINPATH}:${SBINPATH}:\$PATH\""
 fi
 
 # We gather the path into a variable of our own for faster operation:
@@ -259,7 +259,7 @@
   [[ -z "$(echo "${ORIGINAL_MANPATH}" | awk -F : '{print $NF}')" ]]; then
     echo "Your shell already has the right MANPATH environment variable for use with MacPorts!"
 else
-    write_setting MANPATH "${MANPAGES}:\$MANPATH"
+    write_setting MANPATH "\"${MANPAGES}:\$MANPATH\""
 fi
 
 # Adding a DISPLAY variable only if we're running on Tiger or less and if it doesn't already exist:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140623/af7d5012/attachment-0001.html>