Repository: incubator-slider Updated Branches: refs/heads/develop 1df52b805 -> e6c105831
SLIDER-877 move SLIDER_HOME assignment to slider.py Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e6c10583 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e6c10583 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e6c10583 Branch: refs/heads/develop Commit: e6c105831d72ffff45ee9a58638a5287043c21f0 Parents: 1df52b8 Author: Billie Rinaldi <[email protected]> Authored: Fri May 15 10:29:03 2015 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Fri May 15 10:29:03 2015 -0700 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider | 4 +--- slider-assembly/src/main/scripts/slider.py | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6c10583/slider-assembly/src/main/scripts/slider ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/scripts/slider b/slider-assembly/src/main/scripts/slider index 28dc205..97dabaf 100755 --- a/slider-assembly/src/main/scripts/slider +++ b/slider-assembly/src/main/scripts/slider @@ -41,7 +41,5 @@ cmd = [pyExecPath + " " + currDir + "/slider.py"] cmd.extend(args) finalCmd = " ".join(cmd) -env = os.environ.copy() -env['SLIDER_HOME'] = os.path.dirname(currDir) -result = subprocess.call(finalCmd, env=env, shell=True) +result = subprocess.call(finalCmd, shell=True) sys.exit(result) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6c10583/slider-assembly/src/main/scripts/slider.py ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/scripts/slider.py b/slider-assembly/src/main/scripts/slider.py index e1112eb..83d8fc0 100644 --- a/slider-assembly/src/main/scripts/slider.py +++ b/slider-assembly/src/main/scripts/slider.py @@ -27,7 +27,8 @@ CONF = "conf" IS_WINDOWS = platform.system() == "Windows" LIB = "lib" -ENV_KEYS = ["JAVA_HOME", "HADOOP_CONF_DIR", "SLIDER_CONF_DIR", "SLIDER_JVM_OPTS", "SLIDER_CLASSPATH_EXTRA"] +ENV_KEYS = ["JAVA_HOME", "HADOOP_CONF_DIR", "SLIDER_HOME", "SLIDER_CONF_DIR", "SLIDER_JVM_OPTS", "SLIDER_CLASSPATH_EXTRA"] +SLIDER_HOME = "SLIDER_HOME" SLIDER_CONF_DIR = "SLIDER_CONF_DIR" SLIDER_JVM_OPTS = "SLIDER_JVM_OPTS" SLIDER_CLASSPATH_EXTRA = "SLIDER_CLASSPATH_EXTRA" @@ -294,6 +295,7 @@ def main(): """ args = sys.argv[1:] slider_home = sliderDir() + os.environ[SLIDER_HOME] = slider_home libdir = dirMustExist(libDir(slider_home)) confdir = dirMustExist(confDir(slider_home)) executeEnvSh(confdir)
