From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0DEC1138334 for ; Sat, 6 Oct 2018 01:35:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEF86E093A; Sat, 6 Oct 2018 01:35:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96D43E093A for ; Sat, 6 Oct 2018 01:35:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05826335CCF for ; Sat, 6 Oct 2018 01:35:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 477E03F6 for ; Sat, 6 Oct 2018 01:35:27 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1538789059.d5ed2a39f1ba4c9c67e0ec79ec18986d37a198c1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/etc-update X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d5ed2a39f1ba4c9c67e0ec79ec18986d37a198c1 X-VCS-Branch: master Date: Sat, 6 Oct 2018 01:35:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5feb8f48-9b59-4ee0-b2b3-c2347dd79826 X-Archives-Hash: 8da842a06062dc1e327640f7e9022df4 commit: d5ed2a39f1ba4c9c67e0ec79ec18986d37a198c1 Author: kewl fft alto eu org> AuthorDate: Wed Oct 3 18:37:44 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 6 01:24:19 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d5ed2a39 etc-update: combined use of /etc/os-release ID and ID_LIKE Closes: https://github.com/gentoo/portage/pull/372 Signed-off-by: Kewl Fft xrjy nygb.rh.bet (rot13) Signed-off-by: Zac Medico gentoo.org> bin/etc-update | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/etc-update b/bin/etc-update index f0aaca1e6..3951ec674 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -32,13 +32,13 @@ get_config() { "${PORTAGE_CONFIGROOT}"etc/etc-update.conf) } -OS_RELEASE_ID=$(cat /etc/os-release 2>/dev/null | grep '^ID=' | cut -d'=' -f2 | sed -e 's/"//g') +OS_RELEASE_POSSIBLE_IDS=$(source /etc/os-release >/dev/null 2>&1; echo ":${ID}:${ID_LIKE}:") -case $OS_RELEASE_ID in - suse|opensuse|opensuse-leap|opensuse-tumbleweed) OS_FAMILY='rpm' ;; - fedora|rhel) OS_FAMILY='rpm' ;; - arch|archarm|arch32|manjaro|antergos) OS_FAMILY='arch' NEW_EXT='pacnew';; - *) OS_FAMILY='gentoo' ;; +case ${OS_RELEASE_POSSIBLE_IDS} in + *:suse:*|*:opensuse:*|*:opensuse-tumbleweed:*) OS_FAMILY='rpm';; + *:fedora:*|*:rhel:*) OS_FAMILY='rpm';; + *:arch:*|*:manjaro:*|*:antergos:*) OS_FAMILY='arch' NEW_EXT='pacnew';; + *) OS_FAMILY='gentoo';; esac if [[ $OS_FAMILY == 'gentoo' ]]; then