From 8568e471fa5a3c7e874eed66519642cdd97304bd Mon Sep 17 00:00:00 2001 From: Yeongjin Jeong Date: Mon, 29 Jul 2019 12:22:55 +0900 Subject: [PATCH] uninstalled: Ensure bash prompt override even if bash script file does not exist If automatic bash prompt override is enabled via the 'GST_BUILD_DISABLE_PS1_OVERRIDE', We should set the bash prompt to have a visual indicator of the "gst-uninstalled" environment even if bash script file does not exist. --- gst-uninstalled.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gst-uninstalled.py b/gst-uninstalled.py index 7db8be6988..eb275f3f79 100755 --- a/gst-uninstalled.py +++ b/gst-uninstalled.py @@ -298,16 +298,16 @@ if __name__ == "__main__": else: args = [os.environ.get("SHELL", os.path.realpath("/bin/sh"))] if "bash" in args[0] and not strtobool(os.environ.get("GST_BUILD_DISABLE_PS1_OVERRIDE", r"FALSE")): + tmprc = tempfile.NamedTemporaryFile(mode='w') bashrc = os.path.expanduser('~/.bashrc') if os.path.exists(bashrc): - tmprc = tempfile.NamedTemporaryFile(mode='w') with open(bashrc, 'r') as src: shutil.copyfileobj(src, tmprc) - tmprc.write('\nexport PS1="[gst-%s] $PS1"' % gst_version) - tmprc.flush() - # Let the GC remove the tmp file - args.append("--rcfile") - args.append(tmprc.name) + tmprc.write('\nexport PS1="[gst-%s] $PS1"' % gst_version) + tmprc.flush() + # Let the GC remove the tmp file + args.append("--rcfile") + args.append(tmprc.name) try: exit(subprocess.call(args, close_fds=False, env=get_subprocess_env(options, gst_version)))