refactor: Update resource management in Makefile and adjust font paths

6 files changed, 14 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 65c81df..6a26c04 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ GRUB_THEME_DIR = boot/grub/themes
 DISK_IMAGE = iso/akiba.img
 FS_ROOT = iso/akiba
 BUILD_DIR = iso/build
-SYSTEM_DIRS = resources/fonts resources/test
+RESOURCES_DIR = resources
 BINARIES_DIR = binaries
 
 CONTENT_SIZE_KB := $(shell du -sk $(FS_ROOT) 2>/dev/null | awk '{sum += $$1} END {print sum + 10000}')
@@ -210,15 +210,6 @@ prepare-filesystem: build-grub
 		fi; \
 	done
 	
-	@echo "→ Copying system resources..."
-	@for dir in $(SYSTEM_DIRS); do \
-		if [ -d $$dir ]; then \
-			target_name=$$(basename $$dir); \
-			mkdir -p $(FS_ROOT)/system/$$target_name; \
-			cp -R $$dir/* $(FS_ROOT)/system/$$target_name/; \
-		fi; \
-	done
-	
 	@cp $(GRUB_CONFIG) $(FS_ROOT)/boot/grub/
 	@cp -R $(GRUB_THEME_DIR) $(FS_ROOT)/boot/grub/
 	
@@ -235,7 +226,17 @@ prepare-filesystem: build-grub
 	@echo "→ Copying AFS module to ESP structure..."
 	@mkdir -p $(FS_ROOT)/boot/grub/modules
 	@cp $(GRUB_BUILD)/lib/grub/x86_64-efi/afs.mod $(FS_ROOT)/boot/grub/modules/
-	
+
+	@echo "→ Copying resources..."
+	@for dir in $(RESOURCES_DIR)/*/; do \
+		if [ -d "$$dir" ]; then \
+			dirname=$$(basename $$dir); \
+			mkdir -p $(FS_ROOT)/$$dirname; \
+			cp -R $$dir* $(FS_ROOT)/$$dirname/; \
+			echo "  ✓ /$$dirname"; \
+		fi; \
+	done
+
 	@echo "✓ Build completed successfully"
 	@echo ""
 	@echo "Built artifacts:"
diff --git a/mirai/boot/sequence/sequence.zig b/mirai/boot/sequence/sequence.zig
index 7a68da9..1f735d5 100644
--- a/mirai/boot/sequence/sequence.zig
+++ b/mirai/boot/sequence/sequence.zig
@@ -96,7 +96,7 @@ pub fn run(multiboot_addr: u64) void {
 
     step("Loading font");
     var font_buffer: [boot_limits.FONT_BUFFER_SIZE]u8 = undefined;
-    const bytes_read = fs.view_unit_at("/system/fonts/Akiba.psf", &font_buffer) catch |err| {
+    const bytes_read = fs.view_unit_at("/system/fonts/akiba.psf", &font_buffer) catch |err| {
         fail();
         print_error(err);
         halt();
diff --git a/resources/system/akiba/mirai.version b/resources/system/akiba/mirai.version
new file mode 100644
index 0000000..6c6aa7c
--- /dev/null
+++ b/resources/system/akiba/mirai.version
@@ -0,0 +1 @@
+0.1.0
\ No newline at end of file
diff --git a/resources/fonts/Akiba.psf b/resources/system/fonts/akiba.psf
index b48310d..b48310d 100644
--- a/resources/fonts/Akiba.psf
+++ b/resources/system/fonts/akiba.psf
diff --git a/resources/fonts/term.psf b/resources/system/fonts/term.psf
index 96673c4..96673c4 100644
--- a/resources/fonts/term.psf
+++ b/resources/system/fonts/term.psf
diff --git a/resources/test/test.txt b/resources/test/test.txt
deleted file mode 100644
index 04eb252..0000000
--- a/resources/test/test.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello from Akiba OS!
-This is a test file.
-File I/O is working!
\ No newline at end of file