From 94f978430ed9edb68c778b98fd484a1861158e7c Mon Sep 17 00:00:00 2001
From: Matheus <matheusuky@gmail.com>
Date: Sat, 2 May 2026 14:29:40 -0300
Subject: [PATCH] jinx: use as a submodule instead

---
 .gitignore  |  1 -
 .gitmodules |  3 +++
 Makefile    | 24 +++++++++++-------------
 jinx        |  1 +
 4 files changed, 15 insertions(+), 14 deletions(-)
 create mode 160000 jinx

diff --git a/.gitignore b/.gitignore
index 6df4e3d7..1665d389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ host-builds
 host-pkgs
 iso
 img
-jinx
 pkgs
 sources
 astral.iso
diff --git a/.gitmodules b/.gitmodules
index 3c94e0c4..b638d75d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "kernel-src/io/acpi/uacpi"]
 	path = kernel-src/io/acpi/uacpi
 	url = https://github.com/UltraOS/uACPI
+[submodule "jinx"]
+	path = jinx
+	url = https://codeberg.org/Mintsuki/jinx.git
diff --git a/Makefile b/Makefile
index bcd795d8..98c01ac4 100644
--- a/Makefile
+++ b/Makefile
@@ -40,14 +40,13 @@ all: $(JINX_DIR)/.astral_ok
 	@echo "|--------------------------------------------------------------|"
 	@echo
 
-jinx:
-	curl https://codeberg.org/Mintsuki/jinx/raw/commit/1c40ceb62e09befc5172d1caf53e3e440a19f624/jinx > jinx
-	chmod +x jinx
+jinx/jinx:
+	git submodule update --init --recursive jinx
 
-$(JINX_DIR)/.astral_ok: jinx
+$(JINX_DIR)/.astral_ok: jinx/jinx
 	mkdir -p $(JINX_DIR)
 	cd $(JINX_DIR) && \
-	../jinx init .. ARCH=$(JINX_ARCH) && \
+	../jinx/jinx init .. ARCH=$(JINX_ARCH) && \
 	touch .astral_ok
 
 iso: $(ISO)
@@ -73,27 +72,27 @@ kernel:
 	cd $(JINX_DIR) && \
 	rm -f builds/astral.packaged && \
 	rm -f builds/astral.built && \
-	../jinx build astral
+	../jinx/jinx build astral
 
 distro-minimal:
 	cd $(JINX_DIR) && \
-	../jinx update $(MINIMALPACKAGES)
+	../jinx/jinx update $(MINIMALPACKAGES)
 
 distro-full:
 	cd $(JINX_DIR) && \
-	../jinx update '*'
+	../jinx/jinx update '*'
 
 # ------ initrd targets ------
 
 $(INITRD)-full: distro-full
 	cd $(JINX_DIR) && \
-	../jinx install sysroot \* && \
+	../jinx/jinx install sysroot \* && \
 	mkdir -p initrds && \
 	../geninitrd.sh sysroot $(INITRD)-full
 
 $(INITRD)-minimal: distro-minimal
 	cd $(JINX_DIR) && \
-	../jinx install minimalsysroot $(MINIMALPACKAGES) && \
+	../jinx/jinx install minimalsysroot $(MINIMALPACKAGES) && \
 	mkdir -p initrds && \
 	../geninitrd.sh minimalsysroot $(INITRD)-minimal
 
@@ -108,12 +107,12 @@ disk: disk-$(DISTROTYPE)
 
 disk-full: distro-full
 	cd $(JINX_DIR) && \
-	../jinx install sysroot \* && \
+	../jinx/jinx install sysroot \* && \
 	../gendisk.sh 7g sysroot $(DISKNAME)
 
 disk-minimal: distro-minimal
 	cd $(JINX_DIR) && \
-	../jinx install minimalsysroot $(MINIMALPACKAGES) && \
+	../jinx/jinx install minimalsysroot $(MINIMALPACKAGES) && \
 	../gendisk.sh 1900m minimalsysroot $(DISKNAME)
 
 # ------ clean targets ------
@@ -125,7 +124,6 @@ clean-kernel:
 	find builds/astral/ -name *.asmo -delete
 
 clean:
-	rm -rf jinx
 	rm -rf sources
 	rm -rf $(JINX_DIR)
 # ------ run targets ------
diff --git a/jinx b/jinx
new file mode 160000
index 00000000..1c40ceb6
--- /dev/null
+++ b/jinx
@@ -0,0 +1 @@
+Subproject commit 1c40ceb62e09befc5172d1caf53e3e440a19f624