mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-24 09:13:37 +02:00
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>
This commit is contained in:
parent
e2e1b3388c
commit
1da00283d1
3 changed files with 6 additions and 25 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue