added environment.sh, revert a753a107

setup.py

@@ -89,7 +89,6 @@ setup(name=name,
           'dumpmdb = slapos.recipe.dumpmdb:Recipe',
           'duplicity = slapos.recipe.duplicity:Recipe',
           'egg_test = slapos.recipe.erp5_test:EggTestRecipe',
-          'environment = slapos.recipe.environment:Recipe',
           'equeue = slapos.recipe.equeue:Recipe',
           'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
           'erp5.promise = slapos.recipe.erp5_promise:Recipe',

software/zimbra/buildout.cfg

@@ -52,6 +52,7 @@ parts =
   perl-URI
   zimbra-sources
   environment
+  sh-environment
   zimbra-build
 
 
@@ -109,7 +110,7 @@ stop-on-error = True
 
 
 [environment]
-recipe = slapos.cookbook:environment
+recipe = collective.recipe.environment
 ZIMBRA_HOME = ${directories:zimbra-home}
 JAVA_HOME = ${jdk:location}
 ANT_HOME = ${ant:location}
@@ -121,6 +122,21 @@ NCURSES_PREFIX = ${ncurses:location}
 MAKEARGS=-j8
 
 
+[sh-environment]
+recipe = collective.recipe.template
+input = inline:
+  export ZIMBRA_HOME="${environment:ZIMBRA_HOME}"
+  export JAVA_HOME="${environment:JAVA_HOME}"
+  export ANT_HOME="${environment:ANT_HOME}"
+  export PATH="${environment:PATH}"
+  export LD_LIBRARY_PATH="${environment:LD_LIBRARY_PATH}"
+  export BZIP2_PREFIX="${environment:BZIP2_PREFIX}"
+  export PCRE_PREFIX="${environment:PCRE_PREFIX}"
+  export NCURSES_PREFIX="${environment:NCURSES_PREFIX}"
+output = ${buildout:directory}/environment.sh
+
+
+
 [directories]
 recipe = slapos.cookbook:mkdirectory
 zimbra-home = ${buildout:directory}/zimbra-home