04d82ac2d5
* Update Rust to 1.12.0, changes based on Arch Linux's package. * Forgot to add cmake to rust :P * Made minimum cmake to 3.4.3 in rust package, maybe fix the tea CI build. * Fixed rust license install location. * Fixed small formattion issues in rust package. * Rust version 1.12.0 is now pre-installed with cargo * Got rid of merge conflict leftovers
25 lines
830 B
Diff
25 lines
830 B
Diff
commit 7be5e15a12b89168e4d096348848eaa9a9534858
|
|
Author: Zion Nimchuk <zionnimchuk@gmail.com>
|
|
Date: Fri Oct 14 22:45:53 2016 -0700
|
|
|
|
Force download to use curl, not powershell
|
|
|
|
diff --git a/src/etc/download.py b/src/etc/download.py
|
|
index 5ef0df3..9374262 100644
|
|
--- a/src/etc/download.py
|
|
+++ b/src/etc/download.py
|
|
@@ -7,12 +7,7 @@ import tarfile
|
|
|
|
def get(url, path, quiet=False):
|
|
# see http://serverfault.com/questions/301128/how-to-download
|
|
- if sys.platform == 'win32':
|
|
- run(["PowerShell.exe", "/nologo", "-Command",
|
|
- "(New-Object System.Net.WebClient).DownloadFile('" + url +
|
|
- "', '" + path + "')"], quiet=quiet)
|
|
- else:
|
|
- run(["curl", "-o", path, url], quiet=quiet)
|
|
+ run(["curl", "-o", path, url], quiet=quiet)
|
|
|
|
|
|
def unpack(tarball, dst, quiet=False, strip=0):
|