provide ZIMBRA_USER ennvar to makefiles

software/zimbra/buildout.cfg

@@ -219,8 +219,13 @@ update-command = ${:command}
 stop-on-error = True
 
 
+[environment-base]
+# provides existing envvars to the [environment] section
+recipe = collective.recipe.environment
+
+
 [environment]
-# environment needed for both building and running the applications.
+# environment needed for building the applications.
 recipe = collective.recipe.environment
 ZIMBRA_HOME = ${directories:zimbra-home}
 JAVA_HOME = ${jdk:location}
@@ -231,11 +236,13 @@ BZIP2_PREFIX = ${bzip2:location}
 PCRE_PREFIX = ${pcre:location}
 NCURSES_PREFIX = ${ncurses:location}
 MAKEARGS=-j8
+ZIMBRA_USER=${environment-base:USER}
 
 
 [sh-environment]
-# create a shell script (to be sourced) with the environment's content, for debugging purposes.
+# environment needed for running/debugging the applications, exported to a shell script to be sourced.
 recipe = collective.recipe.template
+output = ${buildout:directory}/environment.sh
 input = inline:
   export ZIMBRA_HOME="${environment:ZIMBRA_HOME}"
   export JAVA_HOME="${environment:JAVA_HOME}"
@@ -246,9 +253,8 @@ input = inline:
   export PCRE_PREFIX="${environment:PCRE_PREFIX}"
   export NCURSES_PREFIX="${environment:NCURSES_PREFIX}"
   export MAKEARGS="${environment:MAKEARGS}"
-  export ZIMBRA_USER="`whoami`"
+  export ZIMBRA_USER="${environment:ZIMBRA_USER}"
 
-output = ${buildout:directory}/environment.sh
 
 
 [directories]