From 741685d7e8bb378d72d6a242219e6f4967b8d80b Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sat, 1 Aug 2015 00:20:12 -0700 Subject: [PATCH] No shell, try new git on travis. --- build_tools | 2 +- xenia-build | 53 +++++++++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/build_tools b/build_tools index 9b829e858..5abc3a9de 160000 --- a/build_tools +++ b/build_tools @@ -1 +1 @@ -Subproject commit 9b829e85822c21a9ff0a3d0f9c31a68daf7cfd3f +Subproject commit 5abc3a9decb130c9f8d79f29048bfc73f71f859e diff --git a/xenia-build b/xenia-build index f87695ab0..00189e11f 100755 --- a/xenia-build +++ b/xenia-build @@ -168,10 +168,10 @@ def shell_call(command, throw_on_error=True, stdout_path=None): try: if throw_on_error: result = 1 - subprocess.check_call(command, shell=True, stdout=stdout_file) + subprocess.check_call(command, shell=False, stdout=stdout_file) result = 0 else: - result = subprocess.call(command, shell=True, stdout=stdout_file) + result = subprocess.call(command, shell=False, stdout=stdout_file) finally: if stdout_file: stdout_file.close() @@ -184,26 +184,35 @@ def git_submodule_update(): Older versions of git do not support 'update --init --recursive'. We could check and run it on versions that do support it and speed things up a bit. """ - shell_call([ - 'git', - 'submodule', - 'init', - ]) - shell_call([ - 'git', - 'submodule', - 'foreach', - '--recursive', - 'git', - 'submodule', - 'init', - ]) - shell_call([ - 'git', - 'submodule', - 'update', - '--recursive', - ]) + if True: + shell_call([ + 'git', + 'submodule', + 'update', + '--init', + '--recursive', + ]) + else: + shell_call([ + 'git', + 'submodule', + 'init', + ]) + shell_call([ + 'git', + 'submodule', + 'foreach', + '--recursive', + 'git', + 'submodule', + 'init', + ]) + shell_call([ + 'git', + 'submodule', + 'update', + '--recursive', + ]) def run_premake(target_os, action):