Fix zip

src/HaxeDownload.hx

@@ -50,14 +50,14 @@ class HaxeDownload {
 		final path = Path.join([Utils.releasesDir, filename]);
 
 		DownloadHelper.download(url + filename, path, () -> {
-			trace('Downloaded $filename as $alias');
+			Sys.println('Downloaded $filename');
 			final out = DownloadHelper.extract(path);
 			FileSystem.deleteFile(path);
 
 			final versionPath = Path.join([Utils.versionsDir, alias]);
 			try FileSystem.deleteFile(versionPath) catch(_) {}
 			FileSync.symlink(Path.join([FileSystem.absolutePath(Utils.releasesDir), out]), versionPath);
-			trace('Done');
+			Sys.println('Installed $filename as $alias');
 		});
 	}
 
@@ -110,7 +110,7 @@ class DownloadHelper {
 	public static function extract(path:String):Null<String> {
 		final pathData = new Path(path);
 		final filename = pathData.file + (pathData.ext == null ? "" : "." + pathData.ext);
-		trace('Extracting $filename...');
+		Sys.println('Extracting $filename...');
 
 		return switch (Path.extension(filename)) {
 			case "zip": new ZipExtractor(File.read(path, true)).extract(pathData.dir);
@@ -154,7 +154,7 @@ class TarExtractor extends format.tar.Reader {
 
 					if (FileSystem.exists(path)) {
 						// TODO: allow overwriting
-						trace('Output already exists; skipping');
+						Sys.println('Output already exists; skipping');
 						return ret;
 					}
 				}
@@ -205,15 +205,15 @@ class ZipExtractor {
 
 					if (FileSystem.exists(path)) {
 						// TODO: allow overwriting
-						trace('Output already exists; skipping');
+						Sys.println('Output already exists; skipping');
 						return ret;
 					}
 				}
 
 				FileSystem.createDirectory(path);
 			} else {
 				final out = File.write(path, true);
-				out.writeBytes(e.data, 0, e.fileSize);
+				out.writeBytes(haxe.zip.Reader.unzip(e), 0, e.fileSize);
 				out.close();
 			}
 		}

src/Utils.hx

@@ -28,7 +28,7 @@ function getReleaseUrl(v:String):Array<String> {
 		case "Mac":
 			['https://github.com/HaxeFoundation/haxe/releases/download/$v/', 'haxe-$v-osx.tar.gz'];
 		case "Windows":
-			['https://github.com/HaxeFoundation/haxe/releases/download/$v/', 'haxe-$v-windows64.zip'];
+			['https://github.com/HaxeFoundation/haxe/releases/download/$v/', 'haxe-$v-win64.zip'];
 		case os: throw 'OS $os is not supported (yet)';
 	}
 }