Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   "Bird, Tim" <Tim.Bird@sony.com>
To:     Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
        Linux Doc Mailing List <linux-doc@vger.kernel.org>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Jonathan Corbet <corbet@lwn.net>,
        Markus Heiser <markus.heiser@darmarit.de>
Subject: RE: [PATCH 1/6] scripts: sphinx-pre-install: improve distro detection
 check
Thread-Topic: [PATCH 1/6] scripts: sphinx-pre-install: improve distro
 detection check
Thread-Index: AQHWDb5iIjm0kAhwrECaQ7vbPFdNK6hvcodA
Date:   Wed, 8 Apr 2020 17:01:20 +0000
Message-ID: <MWHPR13MB08950C5CC92A0C0FE0532AFAFDC00@MWHPR13MB0895.namprd13.prod.outlook.com>
References: <cover.1586361086.git.mchehab+huawei@kernel.org>
 <2f22c8a80a4740176fabdee0d0cd23dbe7395b03.1586361086.git.mchehab+huawei@kernel.org>
In-Reply-To: <2f22c8a80a4740176fabdee0d0cd23dbe7395b03.1586361086.git.mchehab+huawei@kernel.org>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: sony.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 6d77e18d-3675-4ea5-5bb6-08d7dbde7623
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Apr 2020 17:01:20.5037
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 66c65d8a-9158-4521-a2d8-664963db48e4
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 7z3LLFwKM5aPleDHVJ4frcXBw4InjDDvWb+TgpaYQusDW6iKBiubAGEq8sc8VINekhRnEkS8gsWGGrcOb6jzmA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR13MB1838
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Mauro Carvalho Chehab <mchehab@kernel.org> On Behalf Of Mauro Carva=
lho Chehab
>=20
> The Arch-linux detection is hit by catting /etc/issue, whose
> contents is (nowadays):
>=20
> 	Arch Linux \r (\l)
>=20
> It sounds a little ackward to print such string, so,
> instead, let's use the /etc/os-release file, with exists
> on lots of distributions and should provide a more reliable
> result.
>=20
> We'll keep the old tests before it, in order to avoid possible
> regressions with the other distros, although the new way should
> probably work on all the currently supported distributions.
>=20
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
>  scripts/sphinx-pre-install | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>=20
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index fa3fb05cd54b..c2071a1c69ea 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -780,6 +780,24 @@ $system_release =3D catcheck("/etc/system-release") =
if !$system_release;
>  $system_release =3D catcheck("/etc/redhat-release") if !$system_release;
>  $system_release =3D catcheck("/etc/lsb-release") if !$system_release;
>  $system_release =3D catcheck("/etc/gentoo-release") if !$system_release;
> +
> +# This seems more common than LSB those days
should 'those' be 'these'?

> +if (!$system_release) {
> +	my %os_var;
> +	if (open IN, "cat /etc/os-release|") {
> +		while (<IN>) {
> +			if (m/^([\w\d\_]+)=3D\"?([^\"]*)\"?\n/) {
> +				$os_var{$1}=3D$2;
> +			}
> +		}
> +		$system_release =3D $os_var{"NAME"};
> +		if (defined($os_var{"VERSION_ID"})) {
> +			$system_release .=3D " " . $os_var{"VERSION_ID"} if (defined($os_var{=
"VERSION_ID"}));
> +		} else {
> +			$system_release .=3D " " . $os_var{"VERSION"};
> +		}
> +	}
> +}
>  $system_release =3D catcheck("/etc/issue") if !$system_release;
>  $system_release =3D~ s/\s+$//;
>=20
> --
> 2.25.2