From: Ryan Eatmon Date: Tue, 10 Sep 2024 20:17:24 +0000 (-0500) Subject: oe-setup-build: Change how we get the SHELL value X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f3099b7eddccf2b7328c0fdd6423269d17138ce;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oe-setup-build: Change how we get the SHELL value There are times that a user might not have SHELL set for some reason. We should default back to a known shell in the event that SHELL is not set. Signed-off-by: Ryan Eatmon Signed-off-by: Richard Purdie --- diff --git a/scripts/oe-setup-build b/scripts/oe-setup-build index 1cb06b3b793..80d8c70bacc 100755 --- a/scripts/oe-setup-build +++ b/scripts/oe-setup-build @@ -102,9 +102,9 @@ def setup_build_env(args): cmd = "TEMPLATECONF={} {}".format(template["templatepath"], cmd_base) if not no_shell: - cmd = cmd + " && {}".format(os.environ['SHELL']) + cmd = cmd + " && {}".format(os.environ.get('SHELL','bash')) print("Running:", cmd) - subprocess.run(cmd, shell=True, executable=os.environ['SHELL']) + subprocess.run(cmd, shell=True, executable=os.environ.get('SHELL','bash')) parser = argparse.ArgumentParser(description="A script that discovers available build configurations and sets up a build environment based on one of them. Run without arguments to choose one interactively.") parser.add_argument("--layerlist", default=defaultlayers(), help='Where to look for available layers (as written out by setup-layers script) (default is {}).'.format(defaultlayers()))