diff --git a/build/download.hxb b/build/download.hxb index da9dea0..3585f5a 100644 Binary files a/build/download.hxb and b/build/download.hxb differ diff --git a/build/select.hxb b/build/select.hxb index 53ba9e5..2a78168 100644 Binary files a/build/select.hxb and b/build/select.hxb differ diff --git a/src/HaxeDownload.hx b/src/HaxeDownload.hx index 534f4ec..ad4dc2b 100644 --- a/src/HaxeDownload.hx +++ b/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 { 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,7 +205,7 @@ class ZipExtractor { if (FileSystem.exists(path)) { // TODO: allow overwriting - trace('Output already exists; skipping'); + Sys.println('Output already exists; skipping'); return ret; } } @@ -213,7 +213,7 @@ class ZipExtractor { 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(); } } diff --git a/src/Utils.hx b/src/Utils.hx index 6582dea..25080b8 100644 --- a/src/Utils.hx +++ b/src/Utils.hx @@ -28,7 +28,7 @@ function getReleaseUrl(v:String):Array { 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)'; } }