From 1da00283d1e35e71d440d8d328d059b39b3a5061 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Mon, 2 Mar 2026 09:25:32 +0100
Subject: [PATCH] jw.pkg.cmds.projects.CmdOsCascade: Remove

CmdOsCascade is superseeded by CmdInfo. Use the latter and retire the
former.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/create-mkspec.sh                       |  3 +--
 scripts/pkg.sh                                 | 12 ++++++------
 .../jw/pkg/cmds/projects/CmdOsCascade.py       | 18 ------------------
 3 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 src/python/jw/pkg/cmds/projects/CmdOsCascade.py

diff --git a/scripts/create-mkspec.sh b/scripts/create-mkspec.sh
index cf43b5f8..d6a5f968 100644
--- a/scripts/create-mkspec.sh
+++ b/scripts/create-mkspec.sh
@@ -41,7 +41,7 @@ subpackage_description()
 
 os_cascade()
 {
-	/usr/bin/python3 $JWB_SCRIPT_DIR/jw-pkg.py projects os-cascade
+	/usr/bin/python3 $JWB_SCRIPT_DIR/jw-pkg.py distro info --format '%{cascade}'
 }
 
 # -- here we go
@@ -129,7 +129,6 @@ for p in $subpackages; do
 	for stage in pre preun post postun; do
 		echo "== processing stage $stage: cfg_section pkg.$p.$stage" >&2
 		out=""
-		#for os in '' `os_cascade | sed 's/\(^\| \)/ ./g'`; do
 		for os in '' `os_cascade`; do
 			sec=pkg.$p.$stage
 			if [ "$os" ]; then
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 1943a7fb..9cecfd0c 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -34,16 +34,16 @@ fatal()
 	quit 1
 }
 
+distro_info()
+{
+	/usr/bin/python3 $JWB_SCRIPT_DIR/jw-pkg.py distro info --format "$1"
+}
+
 os()
 {
 	/bin/bash $JWB_SCRIPT_DIR/get-os.sh
 }
 
-os_cascade()
-{
-	/usr/bin/python3 $JWB_SCRIPT_DIR/jw-pkg.py projects os-cascade
-}
-
 cfg_section()
 {
 	ini_section "$inifile" $@
@@ -1095,7 +1095,7 @@ cmd_milk_install_log()
 
 				echo "== processing stage $stage: cfg_section pkg.$p.$stage" >&2
 				local os content=""
-				for os in '' `os_cascade`; do
+				for os in '' `distro_info '%{cascade}'`; do
 					local sec=pkg.$p.$stage head=""
 					if [ "$os" ]; then
 						sec="$sec.$os"
diff --git a/src/python/jw/pkg/cmds/projects/CmdOsCascade.py b/src/python/jw/pkg/cmds/projects/CmdOsCascade.py
deleted file mode 100644
index 8ade4396..00000000
--- a/src/python/jw/pkg/cmds/projects/CmdOsCascade.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from argparse import Namespace, ArgumentParser
-
-from ..Cmd import Cmd
-from ..CmdProjects import CmdProjects
-
-class CmdOsCascade(Cmd): # export
-
-    def __init__(self, parent: CmdProjects) -> None:
-        super().__init__(parent, 'os-cascade', help='Print project.conf\'s OS configuration precedence of machine this script runs on')
-
-    def add_arguments(self, parser: ArgumentParser) -> None:
-        super().add_arguments(parser)
-
-
-    async def _run(self, args: Namespace) -> None:
-        print(' '.join(self.app.os_cascade()))