[Plone-cvs] r38659 - in Installers/UnifiedInstaller/branches/pristine-python: . buildout_templates

[Steve M. <svn...@pl...>]

Author: smcmahon
Date: Sun Aug  8 18:29:11 2010
New Revision: 38659

Modified:
   Installers/UnifiedInstaller/branches/pristine-python/buildout_templates/cluster.cfg
   Installers/UnifiedInstaller/branches/pristine-python/buildout_templates/standalone.cfg
   Installers/UnifiedInstaller/branches/pristine-python/install.sh
Log:
Update versions for supporting tools

Modified: Installers/UnifiedInstaller/branches/pristine-python/buildout_templates/cluster.cfg
==============================================================================
--- Installers/UnifiedInstaller/branches/pristine-python/buildout_templates/cluster.cfg	(original)
+++ Installers/UnifiedInstaller/branches/pristine-python/buildout_templates/cluster.cfg	Sun Aug  8 18:29:11 2010
@@ -196,9 +196,9 @@
 PasteScript = 1.7.3
 Products.DocFinderTab = 1.0.4
 ZopeSkel = 2.17
-collective.recipe.backup = 1.3
+collective.recipe.backup = 1.4
 collective.recipe.omelette = 0.9
-mr.developer = 1.14
+mr.developer = 1.15
 plone.recipe.command = 1.1
 plone.recipe.osxcontroller = 0.4
 plone.recipe.unifiedinstaller = 4.0b3

Modified: Installers/UnifiedInstaller/branches/pristine-python/buildout_templates/standalone.cfg
==============================================================================
--- Installers/UnifiedInstaller/branches/pristine-python/buildout_templates/standalone.cfg	(original)
+++ Installers/UnifiedInstaller/branches/pristine-python/buildout_templates/standalone.cfg	Sun Aug  8 18:29:11 2010
@@ -190,9 +190,9 @@
 PasteScript = 1.7.3
 Products.DocFinderTab = 1.0.4
 ZopeSkel = 2.17
-collective.recipe.backup = 1.3
+collective.recipe.backup = 1.4
 collective.recipe.omelette = 0.9
-mr.developer = 1.14
+mr.developer = 1.15
 plone.recipe.command = 1.1
 plone.recipe.osxcontroller = 0.4
 plone.recipe.unifiedinstaller = 4.0b3

Modified: Installers/UnifiedInstaller/branches/pristine-python/install.sh
==============================================================================
--- Installers/UnifiedInstaller/branches/pristine-python/install.sh	(original)
+++ Installers/UnifiedInstaller/branches/pristine-python/install.sh	Sun Aug  8 18:29:11 2010
@@ -412,12 +412,11 @@
 fi
 
 
-if [ -x $PLONE_HOME/Python-2.6/bin/python ] ; then
+if [ -x "$PLONE_HOME/Python-2.6/bin/python" ] ; then
     HAVE_PYTHON=yes
-    # echo "Will use existing python."
-    if ["x$WITH_PYTHON" != "x"]; then
+    if [ "x$WITH_PYTHON" != "x" ]; then
         echo "We already have a Python environment for this target; ignoring --with-python."
-        $WITH_PYTHON=''
+        WITH_PYTHON=''
     fi
 fi
 
@@ -632,7 +631,7 @@
     NEED_LOCAL=0
 fi
 
-if [ $WITH_PYTHON ] # try to use specified python
+if [ "x$WITH_PYTHON" != "x" ] # try to use specified python
 then
     PYBNAME=`basename "$WITH_PYTHON"`
     PY_HOME=$PLONE_HOME/Python-2.6