admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path handling on download_and_unzip after previous change.

Browse Source
This commit is contained in:
Jukka Jylänki
2013-09-30 14:27:20 +03:00
parent 4bc8e9e2c4
commit 4b9a7c15c3
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
emsdk
View File

@@ -92,7 +92,7 @@ def untargz(source_filename, dest_dir, unpack_even_if_exists=False):
return True return True
# http://stackoverflow.com/questions/12886768/simple-way-to-unzip-file-in-python-on-all-oses # http://stackoverflow.com/questions/12886768/simple-way-to-unzip-file-in-python-on-all-oses
def unzip(source_filename, dest_dir): def unzip(source_filename, dest_dir, unpack_even_if_exists=False):
if not unpack_even_if_exists and num_files_in_directory(dest_dir) > 0: if not unpack_even_if_exists and num_files_in_directory(dest_dir) > 0:
print "File '" + source_filename + "' has already been unpacked, skipping." print "File '" + source_filename + "' has already been unpacked, skipping."
return True return True
@@ -131,15 +131,18 @@ def path_points_to_directory(path):
else: else:
return True return True
# On success, returns the filename on the disk pointing to the destination file that was produced
# On failure, returns None.
def download_file(url, dstpath, download_even_if_exists=False): def download_file(url, dstpath, download_even_if_exists=False):
file_name = url.split('/')[-1] file_name = url.split('/')[-1]
if path_points_to_directory(dstpath): if path_points_to_directory(dstpath):
file_name = os.path.join(dstpath, file_name) file_name = os.path.join(dstpath, file_name)
else: else:
file_name = dstpath file_name = dstpath
if os.path.exists(file_name) and not download_even_if_exists: if os.path.exists(file_name) and not download_even_if_exists:
print "File '" + file_name + "' already downloaded, skipping." print "File '" + file_name + "' already downloaded, skipping."
return True return file_name
try: try:
u = urllib2.urlopen(url) u = urllib2.urlopen(url)
mkdir_p(os.path.dirname(file_name)) mkdir_p(os.path.dirname(file_name))
@@ -164,12 +167,12 @@ def download_file(url, dstpath, download_even_if_exists=False):
f.close() f.close()
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
print "HTTP error with URL '" + url + "': " + str(e) print "HTTP error with URL '" + url + "': " + str(e)
return False return None
return True return file_name
def download_text_file(url, dstpath, download_even_if_exists=False): def download_text_file(url, dstpath, download_even_if_exists=False):
download_file(url, dstpath, download_even_if_exists) filename = download_file(url, dstpath, download_even_if_exists)
fix_lineendings(os.path.join(emsdk_path(), os.path.split(url)[1])) fix_lineendings(os.path.join(emsdk_path(), filename))
def run_get_output(cmd, cwd=None): def run_get_output(cmd, cwd=None):
process = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, env=os.environ.copy()) process = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, env=os.environ.copy())
@@ -244,13 +247,13 @@ def download_and_unzip(zipfile, dest_dir, download_even_if_exists=False):
if not download_even_if_exists and num_files_in_directory(dest_dir) > 0: if not download_even_if_exists and num_files_in_directory(dest_dir) > 0:
print "The contents of file '" + zipfile + "' already exist in destination '" + dest_dir + "', skipping." print "The contents of file '" + zipfile + "' already exist in destination '" + dest_dir + "', skipping."
return True return True
success = download_file(urlparse.urljoin(emsdk_packages_url, zipfile), 'zips/', download_even_if_exists) dst_file = download_file(urlparse.urljoin(emsdk_packages_url, zipfile), 'zips/', download_even_if_exists)
if not success: if not dst_file:
return False return False
if zipfile.endswith('.zip'): if zipfile.endswith('.zip'):
return unzip('zips/'+zipfile, dest_dir, unpack_even_if_exists=download_even_if_exists) return unzip(dst_file, dest_dir, unpack_even_if_exists=download_even_if_exists)
else: else:
return untargz('zips/'+zipfile, dest_dir, unpack_even_if_exists=download_even_if_exists) return untargz(dst_file, dest_dir, unpack_even_if_exists=download_even_if_exists)
def to_unix_path(p): def to_unix_path(p):
return p.replace('\\', '/') return p.replace('\\', '/')
@@ -502,7 +505,11 @@ class Tool:
elif url.endswith('zip') or url.endswith('.tar') or url.endswith('.gz'): elif url.endswith('zip') or url.endswith('.tar') or url.endswith('.gz'):
success = download_and_unzip(url, self.installation_path()) success = download_and_unzip(url, self.installation_path())
else: else:
success = download_file(urlparse.urljoin(emsdk_packages_url, self.download_url()), self.installation_path()) dst_file = download_file(urlparse.urljoin(emsdk_packages_url, self.download_url()), self.installation_path())
if dst_file:
success = True
else:
success = False
if not success: if not success:
print "Installation failed!" print "Installation failed!"
return False return False