[121312] branches/release_2_3

[jmr at macports.org]

Revision: 121312
          https://trac.macports.org/changeset/121312
Author:   jmr at macports.org
Date:     2014-06-23 03:02:14 -0700 (Mon, 23 Jun 2014)
Log Message:
-----------
merge r121311 from trunk:
 quote PATH and MANPATH values in postflight script (#43798)

Revision Links:
--------------
    https://trac.macports.org/changeset/121311

Modified Paths:
--------------
    branches/release_2_3/base/portmgr/dmg/postflight.in

Property Changed:
----------------
    branches/release_2_3/
    branches/release_2_3/base/


Property changes on: branches/release_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:118056,118161,118640,119204,119297,120127,120132,120142,120345
   + /trunk:118056,118161,118640,119204,119297,120127,120132,120142,120345,121311


Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,121311
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/portmgr/dmg/postflight.in
===================================================================
--- branches/release_2_3/base/portmgr/dmg/postflight.in	2014-06-23 10:00:52 UTC (rev 121311)
+++ branches/release_2_3/base/portmgr/dmg/postflight.in	2014-06-23 10:02:14 UTC (rev 121312)
@@ -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/ff70cdad/attachment.html>