From 20b14c109db32e9a865beb4f838e8e35a5c1ddaa Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Mon, 2 Mar 2026 13:04:12 +0000
Subject: [PATCH] pkg.sh: Determine upload dir from jw-pkg.sh distro info

A compiled release package is currently uploaded to a fixed
directory, determine it dynamically for every distro seperately.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/pkg.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index e76cfd01..99eb7e18 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -616,7 +616,8 @@ upload_pkg()
 		upload_file -q $RPM_PROJECT-devel-$v.$RPM_ARCH.rpm $RPM_ARCH
 		;;
 	debian|deb)
-		server=apt.janware.com
+		local -r server=apt.janware.com
+		local -r distro_subdir=$(distro_info '%{id}/%{codename}')
 		local conf=`mktemp "/tmp/$myname"_XXXXXX`
 		cat <<-EOT > $conf
 		[DEFAULT]
@@ -624,7 +625,7 @@ upload_pkg()
 		[janware-debian]
 		fqdn = $server
 		# login =
-		incoming = /srv/dav/pub/packages/jw-foss/debian/mini-dinstall/incoming/
+		incoming = /var/lib/packager-server/packages/jw-foss/$distro_subdir/incoming/
 		method = rsync
 		hash = sha
 		allow_unsigned_uploads = yes