Fix zip

kLabz · Apr 19, 2024 · 154ee18 · 154ee18
1 parent 3c6c6a5
commit 154ee18
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -74,8 +74,15 @@ jobs:
       - name: Check base usage
         run: |
           hx-download latest
+          dir releases
+          dir versions
           hx-download 4.3.4
+          dir releases
+          dir versions
           hx-download nightly 569e52e
+          dir releases
+          dir versions
           hx-select dev
-          haxe --version
+          dir current
+          haxe.exe --version
 
diff --git a/build/download.hxb b/build/download.hxb
diff --git a/build/select.hxb b/build/select.hxb
diff --git 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<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;
 					}
 				}
@@ -196,24 +196,22 @@ class ZipExtractor {
 
 		for (e in zip) {
 			final path = Path.join([dest, e.fileName]);
-			trace(e.fileName, path);
 
 			if (StringTools.endsWith(e.fileName, '/')) {
 				if (ret == null) {
 					ret = e.fileName;
-					trace(ret);
 
 					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();
 			}
 		}

diff --git a/src/Utils.hx b/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)';
 	}
 }
@@ -39,6 +39,7 @@ function getVersions():Array<String> {
 	return FileSystem.readDirectory(versionsDir);
 }
 
+// TODO: windows vs symlinks
 function hasVersion(v:String):Bool {
 	final dir = Path.join([versionsDir, v]);
 	return FileSystem.isDirectory(dir);
@@ -60,6 +61,7 @@ function selectRelease(r:String):Void {
 	link(dir);
 }
 
+// TODO: unix vs windows
 private function unlinkCurrent():Void {
 	inline function unlink(f:String) {
 		try FileSystem.deleteFile('$currentDir/$f') catch(_) {}
@@ -70,6 +72,7 @@ private function unlinkCurrent():Void {
 	unlink('std');
 }
 
+// TODO: unix vs windows
 private function link(dir:String):Void {
 	if (!FileSystem.exists(currentDir)) FileSystem.createDirectory(currentDir);
 	FileSync.symlink(Path.join(["..", dir, "haxe"]), Path.join([currentDir, "haxe"]));