Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-158_slider_diagnostic_option 0ffd2d57d -> f8210a7c0
SLIDER-440. Add an env.sh file to limit post install changes to conf dir (fix a Windows regression) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5ab149cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5ab149cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5ab149cb Branch: refs/heads/feature/SLIDER-158_slider_diagnostic_option Commit: 5ab149cbdc73a02d0945a97556fc14e51dab47d2 Parents: 0ffd2d5 Author: Sumit Mohanty <[email protected]> Authored: Fri Sep 19 13:38:03 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Sep 19 13:38:03 2014 -0700 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab149cb/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 b290f07..a17e473 100644 --- a/slider-assembly/src/main/scripts/slider.py +++ b/slider-assembly/src/main/scripts/slider.py @@ -19,10 +19,11 @@ import sys import os import subprocess import time +import platform from threading import Thread CONF = "conf" - +IS_WINDOWS = platform.system() == "Windows" LIB = "lib" ENV_KEYS = ["JAVA_HOME", "HADOOP_CONF_DIR"] @@ -50,17 +51,18 @@ to explain the code here """ def executeEnvSh(confDir): - envCmd = 'source %s/slider-env.sh && env' % confDir - command = ['bash', '-c', envCmd] + if not IS_WINDOWS: + envCmd = 'source %s/slider-env.sh && env' % confDir + command = ['bash', '-c', envCmd] - proc = subprocess.Popen(command, stdout = subprocess.PIPE) + proc = subprocess.Popen(command, stdout = subprocess.PIPE) - for line in proc.stdout: - (key, _, value) = line.strip().partition("=") - if key in ENV_KEYS: - os.environ[key] = value + for line in proc.stdout: + (key, _, value) = line.strip().partition("=") + if key in ENV_KEYS: + os.environ[key] = value - proc.communicate() + proc.communicate() def scriptDir():
