smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip run_command

This commit is contained in:
Matthieu Gautier 2020-09-28 18:50:02 +02:00
parent b484e1a356
commit 3129904f35
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kiwixbuild/utils.py
View File

@ -267,8 +267,16 @@ def run_command(command, cwd, context, *, env=None, input=None):
try: try:
if not option('verbose'): if not option('verbose'):
log = open(context.log_file, 'w') log = open(context.log_file, 'w')
runShell = True
if neutralEnv('distname') == 'Windows':
runShell = False
command = command.replace('\\', '\\\\')
cwd = cwd.replace('\\', '\\\\')
print("run command '{}'".format(command), file=log) print("run command '{}'".format(command), file=log)
print("current directory is '{}'".format(cwd), file=log) print("current directory is '{}'".format(cwd), file=log)
print("runShell '{}'".format(runShell), file=log)
print("env is :", file=log) print("env is :", file=log)
for k, v in env.items(): for k, v in env.items():
print(" {} : {!r}".format(k, v), file=log) print(" {} : {!r}".format(k, v), file=log)
@ -278,7 +286,7 @@ def run_command(command, cwd, context, *, env=None, input=None):
kwargs = dict() kwargs = dict()
if input: if input:
kwargs['stdin'] = subprocess.PIPE kwargs['stdin'] = subprocess.PIPE
process = subprocess.Popen(command, shell=True, cwd=cwd, env=env, stdout=log or sys.stdout, stderr=subprocess.STDOUT, **kwargs) process = subprocess.Popen(command, shell=runShell, cwd=cwd, env=env, stdout=log or sys.stdout, stderr=subprocess.STDOUT, **kwargs)
if input: if input:
input = input.encode() input = input.encode()
while True: while True: