From patchwork Sun Dec 20 17:28:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 25864 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E88FF27BC05; Sun, 20 Dec 2020 17:29:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9D8BF1768D for ; Sun, 20 Dec 2020 17:29:26 +0000 (GMT) Received: from localhost ([::1]:48190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kr2WL-0003qx-KX for patchwork@mira.cbaines.net; Sun, 20 Dec 2020 12:29:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kr2Vy-0003pw-DU for guix-patches@gnu.org; Sun, 20 Dec 2020 12:29:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kr2Vy-0008Jn-6p for guix-patches@gnu.org; Sun, 20 Dec 2020 12:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kr2Vy-0001rl-0b for guix-patches@gnu.org; Sun, 20 Dec 2020 12:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 1/5] guix-install.sh: Remove "[[" bashisms in chk_init_sys(). References: <58b21d29-f0b0-af8a-8c9e-11f4dd7a317a@gmail.com> In-Reply-To: <58b21d29-f0b0-af8a-8c9e-11f4dd7a317a@gmail.com> Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Dec 2020 17:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.16084853387158 (code B ref 40601); Sun, 20 Dec 2020 17:29:01 +0000 Received: (at 40601) by debbugs.gnu.org; 20 Dec 2020 17:28:58 +0000 Received: from localhost ([127.0.0.1]:45491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2Vu-0001rO-DY for submit@debbugs.gnu.org; Sun, 20 Dec 2020 12:28:58 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:38692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2Vs-0001r7-Qf for 40601@debbugs.gnu.org; Sun, 20 Dec 2020 12:28:57 -0500 Received: by mail-wr1-f49.google.com with SMTP id r7so8376087wrc.5 for <40601@debbugs.gnu.org>; Sun, 20 Dec 2020 09:28:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rQAs9bMQieejJaGxFztBBnsnSvkWUUEcichMyaqhEmo=; b=imvNhxFvKtIvqX/G2j0rD4KTzTiXPualLHKF0jCQjTWUrZ7OjE6xFO7rqukCERAd4Q B5ssFj9jxgQZyK9neNUKd1TchNdFx+JoTk8usSlMz1aOAolkoERdxAA1BlyByZ1UEGCO DuVE90/DfVRyAOnxrUbZoH1GJMkZrWL4F9NKRNx2wY5TeVO2wFixbiqaPem2qSJNyMLd CCoUk5IVyWH2GB3Nz0jFihd6lP+aZm4jAxswnM9Sgs4XiVH9vzBJjA6xIgPZvhq5rjYp 59q/GGjCdYWE3Td2e2i6CcD1L6ADZ2GjRKBmwBQwRALxZUmeYymFZhQUq7RSGZ3wxTjG QiPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rQAs9bMQieejJaGxFztBBnsnSvkWUUEcichMyaqhEmo=; b=BAlIQpleg+vTZhLczluwRGaAPvKFnzAg1TsuNs5z1xioXDVve5w9v4mLWGVcAq/Zds 52lF9AP+wyQ5ZpWzkZUZG+1zTMd4G6rVBXq92igZSZI7C8BWpktcbUk/6+O8UKdeTNj+ cr6TsOID7FrEpUobycNs/31+/tY6AI2e/jMDV5rYrUvCwLjJbEEMYlNFnEORX/UoSqlM Ypj1UTiA2WG2R4vnJejuGrZPPk0hq8GEr3l+SCqWPhvZ9Hkoa0xYrw0nn6GshPXQ635/ zzwmneefBb9p0IUCOL5rHvXqDS3+N2SvgVMhVV59+UhvbOFqLwQ9dsUZwG9Oz6AQ6yI4 MijQ== X-Gm-Message-State: AOAM531PVcJxFt8XdgCIStUaqDHZt/P+3rezysNXditeMaAdnz0ce8+n fr1RWEOnSlHUTclJr7xEAIY0myjBq7M= X-Google-Smtp-Source: ABdhPJxMbYJ2Oj0zPVOQDG5mUey8rhLVWZxhLrIfmN3P/kBV2hmACdZ34uJyEiWWw03EbMGu6G6nGA== X-Received: by 2002:adf:ec8c:: with SMTP id z12mr14551171wrn.208.1608485330814; Sun, 20 Dec 2020 09:28:50 -0800 (PST) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id h3sm20783535wmm.4.2020.12.20.09.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Dec 2020 09:28:49 -0800 (PST) From: Vincent Legoll Date: Sun, 20 Dec 2020 18:28:35 +0100 Message-Id: <20201220172839.3059-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Legoll Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (chk_init_sys): Use `if something | grep' instead of "[[" pattern matching. --- etc/guix-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 9015f40bb6..26c8622855 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -143,11 +143,11 @@ chk_term() chk_init_sys() { # Return init system type name. - if [[ $(/sbin/init --version 2>/dev/null) =~ upstart ]]; then + if /sbin/init --version 2>/dev/null | grep -q upstart; then _msg "${INF}init system is: upstart" INIT_SYS="upstart" return 0 - elif [[ $(systemctl 2>/dev/null) =~ -\.mount ]]; then + elif systemctl 2>/dev/null | grep -q -- -\.mount; then _msg "${INF}init system is: systemd" INIT_SYS="systemd" return 0 From patchwork Sun Dec 20 17:28:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 25867 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2AE0927BC08; Sun, 20 Dec 2020 17:30:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C9C5D27BC05 for ; Sun, 20 Dec 2020 17:30:24 +0000 (GMT) Received: from localhost ([::1]:49986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kr2XI-0004m4-0e for patchwork@mira.cbaines.net; Sun, 20 Dec 2020 12:30:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kr2Wx-0004Zj-Bs for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kr2Ww-0000Aq-6O for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kr2Ww-0001uD-1U for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 2/5] guix-install.sh: Remove $UID bashism. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Dec 2020 17:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.16084853427182 (code B ref 40601); Sun, 20 Dec 2020 17:30:01 +0000 Received: (at 40601) by debbugs.gnu.org; 20 Dec 2020 17:29:02 +0000 Received: from localhost ([127.0.0.1]:45494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2Vx-0001rj-LN for submit@debbugs.gnu.org; Sun, 20 Dec 2020 12:29:01 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:36929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2Vw-0001rC-CR for 40601@debbugs.gnu.org; Sun, 20 Dec 2020 12:29:00 -0500 Received: by mail-wr1-f48.google.com with SMTP id i9so8394240wrc.4 for <40601@debbugs.gnu.org>; Sun, 20 Dec 2020 09:29:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L+KBkTp2HvXNPAEyFjt66eMogKo2wb8EXaRz0yVOr8o=; b=ffLRO/M4iFVsrzQKQjNOXLw3RgSExYVeooGbzDQPYBeqfzzWxzETqoFl089GD10u7w +QbXRmptoN4QcNlfCq0H8v2ZZIsZ/NOgQuTn3qe6TIu8ksS5zsIb+ZQkXgoqhysioj44 lW9tX4Q+HChOWg4jI8XmB6MSz6tkH8XPJoYh0HhiRjC3iCKfWhMIbKTfGGXvKT1Ho9UV RV8as+P/tW0/n9vEfVWNVm+wksYUhi5bTdfT9zDBxIrMpZhX0hxiMaPZ139piXDJd7O5 b+7I9Z9g2E/aP2m3ibS8lsj5/DRRC2Ly0QKdug9yP2GwstOkbngK3Dh/W0hBMLzJcxFQ eZZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L+KBkTp2HvXNPAEyFjt66eMogKo2wb8EXaRz0yVOr8o=; b=ONAqMh3cf2uh7HFd7OaGC6OC4L1SI7N4lFrr9plE4RsQqeJwbilXdmEC1z/+KrkwD3 eNow9NNP++ePX0G6B2NlcsbhaRhFFGnLrfXnKLzJKJjHv1PQAmTVlqZH5Ub66rfn2w/3 lWp2vieIxMjyIZcbUTFN09F2HqgjwQB9HJpog7c8N2p07pyKXLmbMiW084CmqdLFLMeE Eq9tC68qCF9f+wAIWhqpxUn1aS93beoftiJN3C8+mH86UFDpj/Pe3Bw/I0DJxdCPzP6r KxA1i04VoXk1usRD7bkjh9Q+zIqUB5tXqtayjaML58fgGtd0FKjeqbAAWCNRxCAz8qxU Ntkg== X-Gm-Message-State: AOAM533zms8cEZM9VnfK3NUH9K27KLVpcCpwo6soS8MG8SYB8lk+5sE1 sbKUvjL6Kt5DEqEe+w7qUKF40HbGbeI= X-Google-Smtp-Source: ABdhPJwG9O6V5Rdr+ckGthSp0oY0xsSgpUBcDH+VzzgJPZ0n03KArW+IL1m8l3KuSLJQUdlihJMKOA== X-Received: by 2002:adf:d84e:: with SMTP id k14mr14653060wrl.104.1608485334861; Sun, 20 Dec 2020 09:28:54 -0800 (PST) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id h3sm20783535wmm.4.2020.12.20.09.28.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Dec 2020 09:28:54 -0800 (PST) From: Vincent Legoll Date: Sun, 20 Dec 2020 18:28:36 +0100 Message-Id: <20201220172839.3059-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201220172839.3059-1-vincent.legoll@gmail.com> References: <20201220172839.3059-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Legoll Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh: Use `id -u' instead of $UID. --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 26c8622855..0102901010 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -32,7 +32,7 @@ fi set -e -[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; } +[ "$(id -u)" -eq 0 ] || { echo "This script must be run as root."; exit 1; } REQUIRE=( "dirname" From patchwork Sun Dec 20 17:28:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 25866 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 86E7F27BC06; Sun, 20 Dec 2020 17:30:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F1ED01768D for ; Sun, 20 Dec 2020 17:30:17 +0000 (GMT) Received: from localhost ([::1]:49632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kr2XB-0004bL-4y for patchwork@mira.cbaines.net; Sun, 20 Dec 2020 12:30:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kr2Wx-0004Zk-CF for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kr2Ww-0000Ar-Ok for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kr2Ww-0001uo-Kq for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 3/5] guix-install.sh: Fix requirements. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Dec 2020 17:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.16084853457223 (code B ref 40601); Sun, 20 Dec 2020 17:30:02 +0000 Received: (at 40601) by debbugs.gnu.org; 20 Dec 2020 17:29:05 +0000 Received: from localhost ([127.0.0.1]:45500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2W0-0001sQ-Va for submit@debbugs.gnu.org; Sun, 20 Dec 2020 12:29:05 -0500 Received: from mail-wm1-f50.google.com ([209.85.128.50]:56289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2Vx-0001rE-Ju for 40601@debbugs.gnu.org; Sun, 20 Dec 2020 12:29:02 -0500 Received: by mail-wm1-f50.google.com with SMTP id x22so7525742wmc.5 for <40601@debbugs.gnu.org>; Sun, 20 Dec 2020 09:29:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mGDzRfe1IEAdzowg+aYjIyEJqa1QSXgcwtEmZvj5eZs=; b=ushFXCsE2pj+0onvesPai4G9vA7bLajEyibEHMWUuxClbd1a41NsI4aoUCGJuotBhB I2DiSSVrjX+WiWNg3xQxO5t5M9WxLKWEjIbeX8y/KbiLKtn/B91orCzcYi/3Ea/Ndvvh whOItaJg5gz2zuJgn+fpifE+R/Xu0dhZoBHaEZEYCb3tSLsNjg8iNqgr0C5ZB9bPnBJz oFbvqaurpw+/wQ3CQFH44b33b781Nt51LA+cfK4qiPjpuxq0Y6PqA72w9xMVAO/96Qtd jIZoe5Z3ViBkRJcEfuScoFi/eMsVvbwB63UU5IolOZiysaQtKbThvmFo4j79FCvKk+sH RQNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mGDzRfe1IEAdzowg+aYjIyEJqa1QSXgcwtEmZvj5eZs=; b=ktm5qukL9/FtMiCIioRvHragMjJaWBl1/WQobyogNuOlb0X3LK4BvPZSGMH4Ui1zKY HGWDRua8kagSt2Law8gWVZ9cQrQK1ukwZ9dFVQemYffNpaVy7InFMloAcBY3rNiz6VAs VNtc+CWdA2mFcPyFulBVyEZtUM19AbiUmNI8Uu+sES5VILBEuN+6t+BCL27gtsQihL8p nlh04RM8/UKvkJhI1/zi9kNUzBEJTm2VScomjOvewRlC/A/eyrf8y+zioqWkUgaUaTEN QRPAIFtIyJfZ5hK7SoHW/owPoUR9Z5YYlVivjGvsm6uSZwxytz8DSNpkzm2eiyjvPRgG R5ng== X-Gm-Message-State: AOAM531MgTRJFqb5ZVu4o8HUF9nbuhCd7XeRkM5IM+CSyAf2xs2GdXO+ HL9AIHrV/yeBxHJfStx3l+hJ+cVy/aE= X-Google-Smtp-Source: ABdhPJy8b/QWStS6Hp8hkmu68lNHhZU2yk5XaToKScGGE5UAsfQYJZ0VGQSyq2c+zfVkMfjqJgFr7g== X-Received: by 2002:a1c:4904:: with SMTP id w4mr12584741wma.140.1608485335757; Sun, 20 Dec 2020 09:28:55 -0800 (PST) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id h3sm20783535wmm.4.2020.12.20.09.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Dec 2020 09:28:55 -0800 (PST) From: Vincent Legoll Date: Sun, 20 Dec 2020 18:28:37 +0100 Message-Id: <20201220172839.3059-3-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201220172839.3059-1-vincent.legoll@gmail.com> References: <20201220172839.3059-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Legoll Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches There's no usage of "tr" in the script, whereas tar is used. * etc/guix-install.sh (REQUIRE): Change tr to tar, add ln, remove readlink & dirname. --- etc/guix-install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 0102901010..d40d90b377 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -35,8 +35,6 @@ set -e [ "$(id -u)" -eq 0 ] || { echo "This script must be run as root."; exit 1; } REQUIRE=( - "dirname" - "readlink" "wget" "gpg" "grep" @@ -44,13 +42,14 @@ REQUIRE=( "sed" "sort" "getent" + "ln" "mktemp" "rm" "chmod" "uname" "groupadd" "tail" - "tr" + "tar" "xz" ) From patchwork Sun Dec 20 17:28:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 25865 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6970027BC05; Sun, 20 Dec 2020 17:30:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C5CBE1768D for ; Sun, 20 Dec 2020 17:30:16 +0000 (GMT) Received: from localhost ([::1]:49600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kr2X9-0004aN-W2 for patchwork@mira.cbaines.net; Sun, 20 Dec 2020 12:30:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kr2Wx-0004Zl-OO for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kr2Wx-0000C2-H2 for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kr2Wx-0001vM-EA for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 4/5] guix-install.sh: Fix detection of SysV init system. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Dec 2020 17:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.16084853457230 (code B ref 40601); Sun, 20 Dec 2020 17:30:03 +0000 Received: (at 40601) by debbugs.gnu.org; 20 Dec 2020 17:29:05 +0000 Received: from localhost ([127.0.0.1]:45502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2W1-0001sS-72 for submit@debbugs.gnu.org; Sun, 20 Dec 2020 12:29:05 -0500 Received: from mail-wm1-f53.google.com ([209.85.128.53]:37178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2Vy-0001rG-7C for 40601@debbugs.gnu.org; Sun, 20 Dec 2020 12:29:02 -0500 Received: by mail-wm1-f53.google.com with SMTP id q75so8433105wme.2 for <40601@debbugs.gnu.org>; Sun, 20 Dec 2020 09:29:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2VzI7wwzB0sun3AZD8tfCNLfrsTYlw4PkdKK/WMzhh8=; b=uLQy1gCAu2JYuH0LEcX4VSGomA500UEEyI+i48RB5m21SBaVMJ3Irro3pMloqJSwrg RcPjhpbVHkJeacbdGGlOmMZLLAtmCL6OVuQHve9/DH83MHb1HHptb5r0BTQMwEtzW7K/ WqLXXWvjB6jGloMDUpE5RyLutYkqP7Uqop7w2SPB7h+tQs90vW8DboBHVO7J3sEEyNLl 03MlhU/7g+wddrZbdNJDmTLomhKysx5VC4bNSURov4y/BbC1wlpuWRr4vjUO3i6lNLME XKy+z73amvcRiXAbvfLkUUE3gBFAALfbQX86xLlV+L5DIzTbuta1Hl3fFfq94a5HGrs5 Xo6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2VzI7wwzB0sun3AZD8tfCNLfrsTYlw4PkdKK/WMzhh8=; b=divP9dHHYP1m50FI9IA7dQwYM+gizELjYCYalwpTNIPFCcZzXjdIS2JL1cefxcodtt 5rHqxGeSDONy9kAWC+2KNglgAuwcwrcc/2HBgRIDG0wIyRr6CxOf7v25xkJ8s8BzG5T1 v5Kta3AEZKfYR6UDT56OVLHfuZ3BJYTfFyG/GEKfSt7CXptlPuN7PvZZQPUATMCUCDCj QH/enZnK5AWUCoirnLStGj7fz4X/TrVMBA+vTcSQSPEB96qLsfGmw7Cyo0HqXaALfXqD /bO7vlrUuCHaVC6ozRptZ97yc1jWpYBtONlItpI+l9HMTW+H/Gqvw34ZsxvELH5aHj1I 7ATA== X-Gm-Message-State: AOAM533PlIcAxBHdbHPXUEEWdozrO7w8fkKpDGcsWBl9/FFCDjvsXQAP ziQJMHY3SsUJzXP/hm1bZoIHkss67h4= X-Google-Smtp-Source: ABdhPJyQuKzJuKZA1MOWW5W+rmSX6rf8FoWYcpZcSTZ2dzmULB5s7+jFljoVGW3Zr9WLVtmxa8wZ6w== X-Received: by 2002:a05:600c:2042:: with SMTP id p2mr13116276wmg.152.1608485336638; Sun, 20 Dec 2020 09:28:56 -0800 (PST) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id h3sm20783535wmm.4.2020.12.20.09.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Dec 2020 09:28:56 -0800 (PST) From: Vincent Legoll Date: Sun, 20 Dec 2020 18:28:38 +0100 Message-Id: <20201220172839.3059-4-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201220172839.3059-1-vincent.legoll@gmail.com> References: <20201220172839.3059-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Legoll Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Checking the presence of a regular file & not symlink (/etc/init.d/cron) is not sufficient. Detect a sysvinit system by running `/sbin/init --version' and checking the output contains the string "SysV". * etc/guix-install.sh (chk_init_sys): fix sysvinit system detection. --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index d40d90b377..307c42d3fb 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -150,7 +150,7 @@ chk_init_sys() _msg "${INF}init system is: systemd" INIT_SYS="systemd" return 0 - elif [[ -f /etc/init.d/cron && ! -h /etc/init.d/cron ]]; then + elif /sbin/init --version 2>/dev/null | grep -q SysV; then _msg "${INF}init system is: sysv-init" INIT_SYS="sysv-init" return 0 From patchwork Sun Dec 20 17:28:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 25868 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8B8C27BC06; Sun, 20 Dec 2020 17:30:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2427527BC05 for ; Sun, 20 Dec 2020 17:30:26 +0000 (GMT) Received: from localhost ([::1]:50044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kr2XJ-0004nY-8I for patchwork@mira.cbaines.net; Sun, 20 Dec 2020 12:30:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kr2Wy-0004a3-JI for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kr2Wy-0000CR-A1 for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kr2Wy-0001vy-5v for guix-patches@gnu.org; Sun, 20 Dec 2020 12:30:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 5/5] guix-install.sh: Check daemonize package presence for sysv-init. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Dec 2020 17:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.16084853457236 (code B ref 40601); Sun, 20 Dec 2020 17:30:04 +0000 Received: (at 40601) by debbugs.gnu.org; 20 Dec 2020 17:29:05 +0000 Received: from localhost ([127.0.0.1]:45504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2W1-0001sZ-E9 for submit@debbugs.gnu.org; Sun, 20 Dec 2020 12:29:05 -0500 Received: from mail-wr1-f54.google.com ([209.85.221.54]:39808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kr2Vz-0001rM-3q for 40601@debbugs.gnu.org; Sun, 20 Dec 2020 12:29:03 -0500 Received: by mail-wr1-f54.google.com with SMTP id c5so8359756wrp.6 for <40601@debbugs.gnu.org>; Sun, 20 Dec 2020 09:29:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9u5CgJdMT4W0Fwn47Pl5aTgr7wAAdBuDi+K5hmNDIdQ=; b=AUE4Ws/xhVd0opDd0JMq+nWndTMnW05RZ8+0AGAsWuluVHO1T1Atqcmw3tpe/9Hlsa ukq3EtiRay3Vst4nd4mCnuRUN4Hfo1s3FE9558ztHBMOT9q1ULR1PJolFH0DA/Vw5fyW ytIrj+qTshTstMalM0+i8tT7Nm4L8mzwh/EJ5tiRmNJWK1Pg++geWTTk5rBW8zFfuKPG dtCIpQWGX0b+oVOvsoppiDmOs6cAYupGUYs/pn3ph9s3EENdPCJNimctVVsUkqJxw0kb zRlGe23iYtiiXhPoN++K9mw/CUbyLtH88ywEzHoKeiiJAP6IBRf4pmWhYha+twDf0dNl 0a9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9u5CgJdMT4W0Fwn47Pl5aTgr7wAAdBuDi+K5hmNDIdQ=; b=RC9CUcPaRrWecCR7X1uviPdkTTYqkjVl1iGkOoj6SSJuez7j7IoXRbqauGQZqNk/yK G9Rw8g0iQ7LbdWEoSkogPpqsr3kS/kfF1pTicTXWuExHexgNSM0nM9PWPg4q2pK+3z1G 4V+1i3NjPvNjtRb55jlPpPALl9Ax2JV+AnAi2cOlj9ZNiYH7HzkDthaouhA4NhmCdVhN fFvvUqxb/rqgsVr9NvdnW2UhlBsnE89rUJHSu7E9WpVct31ckVpY+JwcR2Lto6TBCXka N4yvRiVV1bdT8hcpqWPkN77M/65WIvUJvNsPCPixNhEQcSUQCwcAQHBZj1V5sHWKZOu6 WdJg== X-Gm-Message-State: AOAM531vLIzuFzzkSwoQNxdWuUAKTLibCQb6bBwYu3oZwjGY1rHCZb+Y LLZW06a5I5tkkZJvUZRojbZz59hP+4M= X-Google-Smtp-Source: ABdhPJy9Oib1b5crdDT63zVzhEAkTERsjt6dpV3g7w/PCIvKvrp1s0cGgUUZoSUyvXYShmDto+sCvA== X-Received: by 2002:adf:fe05:: with SMTP id n5mr14799690wrr.9.1608485337583; Sun, 20 Dec 2020 09:28:57 -0800 (PST) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id h3sm20783535wmm.4.2020.12.20.09.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Dec 2020 09:28:57 -0800 (PST) From: Vincent Legoll Date: Sun, 20 Dec 2020 18:28:39 +0100 Message-Id: <20201220172839.3059-5-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201220172839.3059-1-vincent.legoll@gmail.com> References: <20201220172839.3059-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Legoll Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh (chk_init_sys): Call `chk_require daemonize'. --- etc/guix-install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 307c42d3fb..ecc86f3e76 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -153,6 +153,10 @@ chk_init_sys() elif /sbin/init --version 2>/dev/null | grep -q SysV; then _msg "${INF}init system is: sysv-init" INIT_SYS="sysv-init" + chk_require daemonize || { + _err "${ERR}Init system: sysv-init requires the 'daemonize' package." + exit 1 + } return 0 elif [[ $(openrc --version 2>/dev/null) =~ \(OpenRC\) ]]; then _msg "${INF}init system is: OpenRC"