Commit 3edebc8d authored by Jason R. Coombs's avatar Jason R. Coombs

Merge

parents a72b003b c8d8126f
...@@ -164,9 +164,20 @@ def download_file_powershell(url, target): ...@@ -164,9 +164,20 @@ def download_file_powershell(url, target):
] ]
subprocess.check_call(cmd) subprocess.check_call(cmd)
download_file_powershell.viable = ( def has_powershell():
lambda: platform.system() == 'Windows' and platform.win32_ver()[1] >= '6' if platform.system() != 'Windows':
) return False
cmd = ['powershell', '-Command', 'echo test']
devnull = open(os.path.devnull, 'wb')
try:
subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
except:
return False
finally:
devnull.close()
return True
download_file_powershell.viable = has_powershell
def download_file_curl(url, target): def download_file_curl(url, target):
cmd = ['curl', url, '--silent', '--output', target] cmd = ['curl', url, '--silent', '--output', target]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment