Fix build

mgord9518 · Sep 3, 2024 · e91e900 · e91e900
1 parent d029b09
commit e91e900
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/cmd/aisap/go.mod b/cmd/aisap/go.mod
@@ -2,16 +2,6 @@ module github.com/mgord9518/aisap/cmd/aisap
 
 go 1.18
 
-replace github.com/mgord9518/aisap => ../../
-
-replace github.com/mgord9518/aisap/permissions => ../../permissions
-
-replace github.com/mgord9518/aisap/profiles => ../../profiles
-
-replace github.com/mgord9518/aisap/spooky => ../../spooky
-
-replace github.com/mgord9518/aisap/helpers => ../../helpers
-
 require (
 	github.com/gookit/color v1.5.4
 	github.com/mgord9518/aisap v0.0.0-00010101000000-000000000000

diff --git a/resources/build.sh b/resources/build.sh
@@ -3,7 +3,7 @@
 
 [ -z "$ARCH" ] && ARCH=$(uname -m)
 PATH="$PATH:$HOME/.local/bin"
-export VERSION=$(cat zig/build.zig.zon | grep '.version' | cut -d'"' -f2)
+export VERSION=$(cat zig/build.zig.zon | grep ' .version' | cut -d'"' -f2)
 
 if [ ! $(command -v 'go') ]; then
 	echo 'Failed to locate GoLang compiler! Unable to build'

diff --git a/zig/build.zig b/zig/build.zig
@@ -40,7 +40,8 @@ pub fn build(b: *std.Build) void {
 
     exe.linkLibrary(squashfuse_dep.artifact("zstd"));
     exe.linkLibrary(squashfuse_dep.artifact("deflate"));
-    //exe.linkLibrary(squashfuse_dep.artifact("deflate"));
+    exe.linkLibrary(squashfuse_dep.artifact("lzma"));
+    exe.linkLibrary(squashfuse_dep.artifact("lz4"));
 
     b.installArtifact(exe);
 }
diff --git a/zig/build.zig.zon b/zig/build.zig.zon
@@ -6,7 +6,8 @@
     .dependencies = .{
         .squashfuse = .{
             .url = "https://github.com/mgord9518/squashfuse-zig/archive/refs/tags/continuous.tar.gz",
-            .hash = "1220e783b731a8fb6825fc1e2652ccd56890b8d7451d668064ed85b2fbddb790f8fa",
+            .hash = "12208f1552f9cb0b16ee3f5277184317cd0fd28a697a3ea1ce56d327a52197411bfc",
+            //.path = "../../squashfuse-zig",
         },
     },
 

diff --git a/zig/lib/AppImage.zig b/zig/lib/AppImage.zig
@@ -5,7 +5,7 @@ const SquashFs = squashfuse.SquashFs;
 
 pub const AppImage = @This();
 
-sqfs: SquashFs,
+sqfs: *SquashFs,
 kind: Kind,
 allocator: std.mem.Allocator,
 
@@ -15,21 +15,22 @@ pub const Kind = enum {
     type2,
 };
 
-pub fn open(allocator: std.mem.Allocator, path: []const u8) !AppImage {
-    const cwd = std.fs.cwd();
-    const file = try cwd.openFile(path, .{});
-
+pub fn open(allocator: std.mem.Allocator, file: std.fs.File) !AppImage {
     std.debug.print("offset {d}\n", .{try offsetFromElf(file)});
 
+    const sqfs = try SquashFs.open(allocator, file, .{
+        .offset = try offsetFromElf(file),
+    });
+
     return .{
-        .sqfs = undefined,
+        .sqfs = sqfs,
         .kind = undefined,
         .allocator = allocator,
     };
 }
 
 pub fn close(appimage: *AppImage) void {
-    _ = appimage;
+    appimage.sqfs.close();
     return;
 }
 

diff --git a/zig/src/main.zig b/zig/src/main.zig
@@ -20,9 +20,13 @@ pub fn main() !void {
         return;
     };
 
+    const cwd = std.fs.cwd();
+    const file = try cwd.openFile(target, .{});
+    defer file.close();
+
     var appimage = try AppImage.open(
         allocator,
-        target,
+        file,
     );
     defer appimage.close();