Added extension to source the .env file after it's rewritten. This

will make the environment variables in it available to commands running
after that. It also removes the need to rewrite the `.env` file because
it's now being sourced by the shell and so it can just evaluate
environment variables normally.

.gitignore

@@ -6,4 +6,4 @@ binaries/trusty/*
 !binaries/trusty/index*.json
 *.pyc
 *.swp
-env
+/env

bin/start

@@ -32,12 +32,8 @@ if __name__ == '__main__':
     home = os.environ['HOME']
 
     # Set the locations of data files
-    envFile = os.path.join(home, '.env')
     procFile = os.path.join(home, '.procs')
 
-    # Load the environment and update
-    os.environ.update(utils.load_env(envFile))
-
     # Load processes and setup the ProcessManager
     pm = process.ProcessManager()
 

lib/build_pack_utils/builder.py

@@ -838,7 +838,7 @@ def process(env):
                     val = val[0]
                 elif len(val) > 1:
                     val = os.pathsep.join(val)
-                envFile.write("%s=%s\n" % (key, val))
+                envFile.write("export %s=%s\n" % (key, val))
         return self
 
     def process_list(self):

lib/env/extension.py

@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+def preprocess_commands(ctx):
+    return (('source', '$HOME/.env'),)

lib/php/extension.py

@@ -30,8 +30,7 @@ def configure(ctx):
 
 
 def preprocess_commands(ctx):
-    return (('$HOME/.bp/bin/rewrite', '"$HOME/php/etc"'),
-            ('$HOME/.bp/bin/rewrite', '"$HOME/.env"'))
+    return (('$HOME/.bp/bin/rewrite', '"$HOME/php/etc"'),)
 
 
 def service_commands(ctx):
@@ -58,12 +57,12 @@ def service_commands(ctx):
 
 def service_environment(ctx):
     env = {
-        'LD_LIBRARY_PATH': '@LD_LIBRARY_PATH:@HOME/php/lib',
-        'PATH': '@PATH:@HOME/php/bin:@HOME/php/sbin',
-        'PHPRC': '@HOME/php/etc'
+        'LD_LIBRARY_PATH': '$LD_LIBRARY_PATH:$HOME/php/lib',
+        'PATH': '$PATH:$HOME/php/bin:$HOME/php/sbin',
+        'PHPRC': '$HOME/php/etc'
     }
     if 'snmp' in ctx['PHP_EXTENSIONS']:
-        env['MIBDIRS'] = '@HOME/php/mibs'
+        env['MIBDIRS'] = '$HOME/php/mibs'
     return env
 
 

scripts/compile.py

@@ -35,6 +35,8 @@
                 .from_build_pack('lib/{WEB_SERVER}')
             .extension()
                 .from_build_pack('lib/{PHP_VM}')
+            .extension()
+                .from_build_pack('lib/env')
             .extensions()
                 .from_build_pack('extensions')
             .extensions()