From 1ef8317ca9a86ae79bbb8a9f1b85743df0ce8a52 Mon Sep 17 00:00:00 2001
From: klemek <klemek.dev@proton.me>
Date: Wed, 4 Nov 2026 21:23:21 +0100
Subject: [PATCH] feat: better start

---
 Makefile             | 10 +++-------
 system/hdmi/start.sh |  8 ++++----
 system/ntsc/start.sh |  6 +++---
 system/pal/start.sh  |  6 +++---
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 8a41afb..28ef669 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ remove-passwd:
 .PHONY: apt-install
 apt-install:
 	sudo apt update
-	sudo apt install -y weston seatd kitty git libglfw3-dev libgl-dev libasound2-dev libv4l-dev python3-pip python3-smbus i2c-tools
+	sudo apt install -y weston seatd git libglfw3-dev libgl-dev libasound2-dev libv4l-dev python3-pip python3-smbus i2c-tools
 
 .PHONY: pip-install
 pip-install:
@@ -54,17 +54,13 @@ clean:
 .PHONY: build
 build: $(BUILD_DIR)/$(TARGET)
 
-.PHONY: run
-run: $(BUILD_DIR)/$(TARGET)
+.PHONY: start-fg
+start-fg: $(BUILD_DIR)/$(TARGET)
 	@$(BUILD_DIR)/$(TARGET) $(RUN_ARGS) 2>&1 | tee -ai $(PROJECT_DIR)/forge.log 2>&1 > /dev/null
 
 .PHONY: start-bg
 start-bg:
 	@python3 $(PROJECT_DIR)/__main__.py 2>&1 | tee -ai $(PROJECT_DIR)/python.log 2>&1 > /dev/null &
 
-.PHONY: start-fg
-start-fg:
-	@/usr/bin/weston --shell=kiosk-shell.so --xwayland --log=$(PROJECT_DIR)/weston.log -- kitty --hold make --silent --no-print-directory -C $(PROJECT_DIR) run 2>&1 > /dev/null
-
 .PHONY: start
 start: start-bg start-fg
diff --git a/system/hdmi/start.sh b/system/hdmi/start.sh
index ca16021..7be0a61 100755
--- a/system/hdmi/start.sh
+++ b/system/hdmi/start.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 export PROJECT_DIR=/opt/forge-invar
-export SCREEN_HEIGHT=576
-
-ln -fs $PROJECT_DIR/system/hdmi/weston.ini $HOME/.config/weston.ini
+export SCREEN_HEIGHT=480
 
 rm -rf $PROJECT_DIR/*.log
 touch $PROJECT_DIR/*
-make -C /opt/forge-invar --silent --no-print-directory start
+
+weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/hdmi/weston.ini --log=$PROJECT_DIR/weston.log \
+    -- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null
diff --git a/system/ntsc/start.sh b/system/ntsc/start.sh
index a685d07..cc41a60 100755
--- a/system/ntsc/start.sh
+++ b/system/ntsc/start.sh
@@ -3,8 +3,8 @@
 export PROJECT_DIR=/opt/forge-invar
 export SCREEN_HEIGHT=480
 
-ln -fs $PROJECT_DIR/system/ntsc/weston.ini $HOME/.config/weston.ini
-
 rm -rf $PROJECT_DIR/*.log
 touch $PROJECT_DIR/*
-make -C /opt/forge-invar --silent --no-print-directory start
+
+weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/nstc/weston.ini --log=$PROJECT_DIR/weston.log \
+    -- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null
diff --git a/system/pal/start.sh b/system/pal/start.sh
index 73427b6..9a45fa3 100755
--- a/system/pal/start.sh
+++ b/system/pal/start.sh
@@ -3,8 +3,8 @@
 export PROJECT_DIR=/opt/forge-invar
 export SCREEN_HEIGHT=576
 
-ln -fs $PROJECT_DIR/system/pal/weston.ini $HOME/.config/weston.ini
-
 rm -rf $PROJECT_DIR/*.log
 touch $PROJECT_DIR/*
-make -C /opt/forge-invar --silent --no-print-directory start
+
+weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/pal/weston.ini --log=$PROJECT_DIR/weston.log \
+    -- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null