From 91da09bd1ac49fb0ffa9399d1dc24ef676fd2177 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 22 May 2021 20:29:03 +0200 Subject: [PATCH] man/check-os-release.*: allow ID_LIKE to have multiple values I missed the fact that it is documented to be a space-separated list. --- man/check-os-release.py | 4 ++-- man/check-os-release.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/check-os-release.py b/man/check-os-release.py index 2440202349c..d009563f025 100644 --- a/man/check-os-release.py +++ b/man/check-os-release.py @@ -30,6 +30,6 @@ os_release = dict(read_os_release()) pretty_name = os_release.get('PRETTY_NAME', 'Linux') print(f'Running on {pretty_name}') -if (os_release.get('ID', 'linux') == 'debian' or - os_release.get('ID_LIKE', None) == 'debian'): +if 'debian' in [os_release.get('ID', 'linux'), + *os_release.get('ID_LIKE', '').split()]: print('Looks like Debian!') diff --git a/man/check-os-release.sh b/man/check-os-release.sh index 2a1a0579283..d00c0f92689 100644 --- a/man/check-os-release.sh +++ b/man/check-os-release.sh @@ -5,6 +5,6 @@ test -e /etc/os-release && os_release='/etc/os-release' || os_release='/usr/lib/ echo "Running on ${PRETTY_NAME:-Linux}" -if [ "${ID:-linux}" = "debian" ] || [ "${ID_LIKE:-}" = "debian" ]; then +if [ "${ID:-linux}" = "debian" ] || [ "${ID_LIKE#*debian*}" != "${ID_LIKE}" ]; then echo "Looks like Debian!" fi -- 2.47.3