]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
man/check-os-release.*: allow ID_LIKE to have multiple values 19700/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 22 May 2021 18:29:03 +0000 (20:29 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 22 May 2021 18:44:04 +0000 (20:44 +0200)
I missed the fact that it is documented to be a space-separated list.

man/check-os-release.py
man/check-os-release.sh

index 2440202349cf6c1dc12eb30f082f12c44174d3f2..d009563f025da651bc04bed86445381dbf68771f 100644 (file)
@@ -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!')
index 2a1a0579283f8c763352c8ab50248d365fd8d675..d00c0f9268965d31df9a324f747bbf4d39aad120 100644 (file)
@@ -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