From af6de30546f80ccfd7cd50d38447addeacb05505 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 4 Apr 2026 19:36:12 +0200
Subject: [PATCH] scripts/usr-bin: Install symlink /usr/bin/jw-pkg

Install a symlink /usr/bin/jw-pkg -> /opt/jw-pkg/bin/jw-pkg.py in
order to have jw-pkg in $PATH.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 conf/bash-completion.d/jw-pkg    | 1 +
 conf/bash-completion.d/jw-pkg.py | 1 -
 scripts/Makefile                 | 2 +-
 scripts/usr-bin/Makefile         | 7 +++++++
 scripts/usr-bin/jw-pkg           | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 conf/bash-completion.d/jw-pkg
 delete mode 100644 conf/bash-completion.d/jw-pkg.py
 create mode 100644 scripts/usr-bin/Makefile
 create mode 120000 scripts/usr-bin/jw-pkg

diff --git a/conf/bash-completion.d/jw-pkg b/conf/bash-completion.d/jw-pkg
new file mode 100644
index 00000000..04de06af
--- /dev/null
+++ b/conf/bash-completion.d/jw-pkg
@@ -0,0 +1 @@
+eval "$(register-python-argcomplete jw-pkg jw-pkg.py /usr/bin/jw-pkg /opt/jw-pkg/bin/jw-pkg.py)"
diff --git a/conf/bash-completion.d/jw-pkg.py b/conf/bash-completion.d/jw-pkg.py
deleted file mode 100644
index d7f5af7f..00000000
--- a/conf/bash-completion.d/jw-pkg.py
+++ /dev/null
@@ -1 +0,0 @@
-eval "$(register-python-argcomplete /opt/jw-pkg/bin/jw-pkg.py jw-pkg.py)"
diff --git a/scripts/Makefile b/scripts/Makefile
index 44e2f969..33ee2db7 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,5 +1,5 @@
 TOPDIR = ..
 
 include $(TOPDIR)/make/proj.mk
-EXE_SH += $(wildcard jannet jcs)
 include $(JWBDIR)/make/scripts.mk
+include $(JWBDIR)/make/dirs.mk
diff --git a/scripts/usr-bin/Makefile b/scripts/usr-bin/Makefile
new file mode 100644
index 00000000..6465ef5b
--- /dev/null
+++ b/scripts/usr-bin/Makefile
@@ -0,0 +1,7 @@
+TOPDIR = ../..
+
+EXE_PREFIX = $(ENV_PREFIX)/usr
+EXE_SH = jw-pkg
+
+include $(TOPDIR)/make/proj.mk
+include $(JWBDIR)/make/scripts.mk
diff --git a/scripts/usr-bin/jw-pkg b/scripts/usr-bin/jw-pkg
new file mode 120000
index 00000000..81998799
--- /dev/null
+++ b/scripts/usr-bin/jw-pkg
@@ -0,0 +1 @@
+/opt/jw-pkg/bin/jw-pkg.py
\ No newline at end of file