From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oPLbLDZQOGda/AAAe85BDQ:P1 (envelope-from ) for ; Sat, 16 Nov 2024 07:56:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id oPLbLDZQOGda/AAAe85BDQ (envelope-from ) for ; Sat, 16 Nov 2024 08:56:38 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Pu1RSonh; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=j0bdo38h; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731743798; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=7vkazje4crajeWuv5WNO/WvJ0OBLHE0Z50k1sYFMY8c=; b=oQLzqQ53Ey7xsjv+SmXX321iPQ3CR38FWMrCT80WED0HtslU9xqionOjB83UFAfGtZ0Zk9 58N6yQcCAIxR3gGVLY+6CcByK6Gt+0bc9zf9VTBEhT17tG35giGfT1Zqi6M44Uk8y2rE3B RFUICit8TT5hcltqCLL4hmog/g2oSM2bbUuxjfyriLxEDh3iacekIBAsBfdEKWE3JATAKr n280q/2F/qM+wgWtQaHgAKRg13rz2v8kYlpQO1HzrJ4j9/3uDNA3UZyZgiX5uwU7UE4WfJ BN+Ddthmr943mIybTNpsioICRh9Z4ZmB1yRHTlmY5xltSJTajG8iZIHA6la01Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731743798; a=rsa-sha256; cv=none; b=PmvFoN3x0VlIlVYDrEh1tdkwGSOUCZ5nV7wVBGuLxCt5frg4fpCHgwOfkqUKhwRw8jVdej SK+IBy0kFJfEIMXNoYmwECJs4yjqiT2/BuaYzCkft9Gaa9C0Gr8ZBqxnAJHmVgGRmmviaB ju9ssjkzGa2Qxt0gw/0huSctnoTA67FJzyI1FYZHAgiEz2SbV6Ca0XAU7Yed2dftSWOX4q jiKTCbLsJaL/RivK1kgc4US86f02BOYuP57Hzq0AfTNNsJ14fyYP4DEjXRKQ6JqXMY9K5T 5R6E1zCA0c97PNbTarN0Ok5UfdUsI99WR72AuL88cM7v4+3AGRYv6rjHuS12+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Pu1RSonh; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=j0bdo38h; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 07F277FFB for ; Sat, 16 Nov 2024 08:56:37 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCDf5-00078B-1h; Sat, 16 Nov 2024 02:56:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tCDf1-00077v-9t for bug-guix@gnu.org; Sat, 16 Nov 2024 02:56:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tCDf0-0006M7-9m for bug-guix@gnu.org; Sat, 16 Nov 2024 02:56:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=7vkazje4crajeWuv5WNO/WvJ0OBLHE0Z50k1sYFMY8c=; b=Pu1RSonhmfNTZbXme3okuLwBWWLx9ZZ93aYaPF4oLagXejin9Pl4ebxfrB0XAvOyap4Yy4nuQcbpEeW8M7Z8Dpyh8c+pL0sZZDtP7US4aHY8fMDruBqAXLWVhKuTzhacDpIse5LJxzD1cqXCSAG973zCUvOrt78UuTClxLh3hKuQuoEsyVX0LbvAb85SMfBHDos62mCU65ewrWiBt4SisMARHl+/rbl629QFrFRy+Lz64Za7Vpo1N41VrRkM7R2AqyxvB8v2eGn6IL8gIefGz24bI/4BfMhTfwO5MjUDJJpdGn5O+IS+8QKVPNfS9nuZNwNnzG8Gv6O8cGmrPP4V/g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCDez-00047U-Tm for bug-guix@gnu.org; Sat, 16 Nov 2024 02:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#67241: [PATCH] guix-install.sh: Add message about Info reader. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 16 Nov 2024 07:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67241 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: Simon Tournier , 67241@debbugs.gnu.org Received: via spool by 67241-submit@debbugs.gnu.org id=B67241.173174372415789 (code B ref 67241); Sat, 16 Nov 2024 07:56:01 +0000 Received: (at 67241) by debbugs.gnu.org; 16 Nov 2024 07:55:24 +0000 Received: from localhost ([127.0.0.1]:51971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCDeN-00046a-Jp for submit@debbugs.gnu.org; Sat, 16 Nov 2024 02:55:24 -0500 Received: from mail-wm1-f44.google.com ([209.85.128.44]:42274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCDeK-00046L-RR for 67241@debbugs.gnu.org; Sat, 16 Nov 2024 02:55:22 -0500 Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4315eac969aso14366715e9.1 for <67241@debbugs.gnu.org>; Fri, 15 Nov 2024 23:55:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731743655; x=1732348455; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7vkazje4crajeWuv5WNO/WvJ0OBLHE0Z50k1sYFMY8c=; b=j0bdo38ht3CO5Wg5ut1O+S4B1t4pGoZ48IkKcmi4mg84ZYFlJj9GfYsGhPh4h2GvoP kJq0L48s38TqvRut7CUsfesfqbAK2vKrHSZpxKw5y+p7ekxwW24V3koioihquCE8Dmqe u7qozIIhqGsXPDZs2g/3t4lkE/p0nooo9B02SNrtnviRb22RbzeYirdlcPi//ItapPH/ oftf4SUJfOIFBpuDyxjpC2MFaHHYLjZAIl2e7b/GPJwsykRZ6Lct3UE5W9mxnTGEVRh5 eWiY/wM9pzMlFi2605qfnPnFfBCd2IihSVu5UCCk+fjnzVtRSyxWqWuGFycyp1GuUsa1 9x4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731743655; x=1732348455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7vkazje4crajeWuv5WNO/WvJ0OBLHE0Z50k1sYFMY8c=; b=vFfkPhsnbQuzvcEOuVT5TR+pYikq/qmnF1kBu7s7a7OO9NyBvHdGRUYHAbXZqQlL7B sOiwEqrFvwTZkDeYuw56SjH8xQWhOcWKQrC21VQfLppblJFfTW+mmhE35YaLM3h/z56E prendld6YWG73DZaAIL0oy4eg/slTah1eM/jz+2TZJJHiUJqeLE1BuLD77wgFb5Z1QUz 9giYYjUwNBsEvGEhTRBXMUGlY7I1+D02jrh+IHwy0egB+wat4z7Rup4J7ifzfp/4c5a+ dro5MkWUqc2ba7/LyEhwbk3o4Bsm2/9Kfq8jaGYNCvkeQGIyukPx0/FkarGo2b0F6Dhn jhWg== X-Gm-Message-State: AOJu0YzAM+gdDTd+7oyH7UwwIpMVzYFgnvRlm6HA5So3nERcJkesAx84 c1PXtDFv5nDVE2RfcIsemFujTTyiQ6qQgbEEsePZB422yFMxTMov X-Google-Smtp-Source: AGHT+IG097M6geAfVYhTX5I/ohhD2rBaIcyBaMPwgwX/dom/Z4kKkpfM9rO1Yolz2qo5aGTVLuMflg== X-Received: by 2002:a05:600c:35ce:b0:428:b4a:7001 with SMTP id 5b1f17b1804b1-432d9767769mr92475625e9.15.1731743654767; Fri, 15 Nov 2024 23:54:14 -0800 (PST) Received: from lili.. (d96ded6d.fsp.oleane.fr. [217.109.237.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432dac21b24sm78553545e9.40.2024.11.15.23.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2024 23:54:14 -0800 (PST) From: Simon Tournier Date: Sat, 16 Nov 2024 08:54:07 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <87h68d6k4e.fsf@gmail.com> References: <87h68d6k4e.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.79 X-Spam-Score: -2.79 X-Migadu-Queue-Id: 07F277FFB X-Migadu-Scanner: mx13.migadu.com X-TUID: 4Tnh73AzQwKb * etc/guix-install.sh (_info): New procedure. (_chk_sys_nscd, main_install): Use it. Change-Id: I2cad8bc2554cd4ea88f30c8a104b7c62f2aa2e0e --- etc/guix-install.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index f07b2741bb..08e25de238 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -5,7 +5,7 @@ # Copyright © 2018 Efraim Flashner # Copyright © 2019–2020, 2022 Tobias Geerinckx-Rice # Copyright © 2020 Morgan Smith -# Copyright © 2020 Simon Tournier +# Copyright © 2020, 2024 Simon Tournier # Copyright © 2020 Daniel Brooks # Copyright © 2021 Jakub Kądziołka # Copyright © 2021 Chris Marusich @@ -129,6 +129,16 @@ die() exit 1 } +_info() +{ + if [ "$(type -P info)" ]; then + _msg "$1" + else + _msg "${WAR}Please install Info reader; see package 'info-reader'" + _msg "$1" + fi +} + # Return true if user answered yes, false otherwise. The prompt is # yes-biased, that is, when the user simply enter newline, it is equivalent to # answering "yes". @@ -290,11 +300,11 @@ chk_sys_nscd() if [ "$(type -P pidof)" ]; then if [ ! "$(pidof nscd)" ]; then _msg "${WAR}We recommend installing and/or starting your distribution 'nscd' service" - _msg "${WAR}Please read 'info guix \"Application Setup\"' about \"Name Service Switch\"" + _info "${WAR}Please read 'info guix \"Application Setup\"' about \"Name Service Switch\"" fi else _msg "${INF}We cannot determine if your distribution 'nscd' service is running" - _msg "${INF}Please read 'info guix \"Application Setup\"' about \"Name Service Switch\"" + _info "${INF}Please read 'info guix \"Application Setup\"' about \"Name Service Switch\"" fi } @@ -856,7 +866,7 @@ main_install() rm -r "${tmp_path}" _msg "${PAS}Guix has successfully been installed!" - _msg "${INF}Run 'info guix' to read the manual." + _info "${INF}Run 'info guix' to read the manual." # Required to source /etc/profile in desktop environments. _msg "${INF}Please log out and back in to complete the installation." base-commit: 3e8d3d80f41e016cdfe80e488a78c2351c94fef8 -- 2.45.2