Cleanup build scripts

This commit is contained in:
Isaac
2025-04-02 18:17:22 +04:00
parent 518e04cab7
commit f546a7ab20
2 changed files with 29 additions and 19 deletions

View File

@@ -11,25 +11,26 @@ def is_apple_silicon():
return False
def get_clean_env():
def get_clean_env(use_clean_env):
clean_env = os.environ.copy()
clean_env['PATH'] = '/usr/bin:/bin:/usr/sbin:/sbin'
if use_clean_env:
clean_env['PATH'] = '/usr/bin:/bin:/usr/sbin:/sbin'
return clean_env
def resolve_executable(program):
def resolve_executable(program, use_clean_env=True):
def is_executable(fpath):
return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
for path in get_clean_env()["PATH"].split(os.pathsep):
for path in get_clean_env(use_clean_env=use_clean_env)["PATH"].split(os.pathsep):
executable_file = os.path.join(path, program)
if is_executable(executable_file):
return executable_file
return None
def run_executable_with_output(path, arguments, decode=True, input=None, stderr_to_stdout=True, print_command=False, check_result=False):
executable_path = resolve_executable(path)
def run_executable_with_output(path, arguments, use_clean_env=True, decode=True, input=None, stderr_to_stdout=True, print_command=False, check_result=False):
executable_path = resolve_executable(path, use_clean_env=use_clean_env)
if executable_path is None:
raise Exception('Could not resolve {} to a valid executable file'.format(path))
@@ -45,7 +46,7 @@ def run_executable_with_output(path, arguments, decode=True, input=None, stderr_
stdout=subprocess.PIPE,
stderr=stderr_assignment,
stdin=subprocess.PIPE,
env=get_clean_env()
env=get_clean_env(use_clean_env=use_clean_env)
)
if input is not None:
output_data, _ = process.communicate(input=input)