From patchwork Sun May 17 17:17:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22165 X-Patchwork-Delegate: mail@cbaines.net 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 39F8127BBE3; Sun, 17 May 2020 18:19:55 +0100 (BST) 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,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 ESMTP id E614827BBE1 for ; Sun, 17 May 2020 18:19:54 +0100 (BST) Received: from localhost ([::1]:43412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMx8-00015P-DX for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwV-00005S-0T for guix-patches@gnu.org; Sun, 17 May 2020 13:19:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwU-0004Pq-LF for guix-patches@gnu.org; Sun, 17 May 2020 13:19:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwU-0007CH-Gc for guix-patches@gnu.org; Sun, 17 May 2020 13:19:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 28/28] Remove "[[" bashisms in chk_init_sys() Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:14 +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 Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158973592427477 (code B ref 40601); Sun, 17 May 2020 17:19:14 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:44 +0000 Received: from localhost ([127.0.0.1]:44624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvz-000791-Su for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:44 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvU-00075J-Dh for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:12 -0400 Received: by mail-wm1-f65.google.com with SMTP id f134so6997914wmf.1 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18:12 -0700 (PDT) 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=ubhbQCy/xKyaGnm6shHlPKr+jGTj6oKsxoPaRxJZUsU=; b=VVsrQB6LXbP3Xc4gsAjeuVwyt82gnqtys3YoCP1xr2oG7SHPIAudJdXnOgffuuTdJv CT1xMFWEprs/Cahczh/v4Sum08A+DLp64Mpj1DjwS5wMu+GJNHmvPXY2CUPA6AbFanVI oeurzJjniU8Gb31RPZ33gWDD8pKjNULq5JorpQkodpM/sxhVY3vH0zsMdgFr9r9IeWAX GtVWP4yMdY9BJPeVPYt74fv1o38viNQv0nXP0Z1vkRxma5FyAcmvZGuFWVifXdHh2F3G 0tDMTohVqFCWaU+Yr3wU7lgOJNdfDKQNF+u1O/Z72T1xyt1WpPCJc6sYJRx13OWwh9YA MecA== 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=ubhbQCy/xKyaGnm6shHlPKr+jGTj6oKsxoPaRxJZUsU=; b=rDaRHfR7b9cObTf8I4D6BhwcgoBnhcRdBGQ6sO6dmEwQoir6deCzwwKa/TE/uEXD5w vVwWsHAK2Wax45zLykUWawI3VnWwI7SKPUii8FAFa3sgTqSaH1X7tHcmIZREricUnFnc nnCRF4UDsjf//7wWXzem+bOYRk1ykb/Jhau5Tf9WRyqMJuf9qleL4REa+ZnJ6Pr0JeXf OfFYcfbe7i+XnsJbAP51oKbTgaFLgSFueXeaodMzq8rmTOwLETuOjZbvqoN9VtvJzrCE APZXJ6p1pVdg5VJ5zn8zwEg/83SoNkw/pqwTVkaZR7vEhbpbjZ2JJQFmWMIl05NqMi4s n20w== X-Gm-Message-State: AOAM530r09QOyiLtFnL+o3sB3dbE3A7a5ZOciVPP0TBoFeaowiDweZ6a nKhoeT6p2rUzbC5oXLyFw3+Gfrqq X-Google-Smtp-Source: ABdhPJzd/AkBjKDtWj8AsFCBYBC/U3ITC9umoW5J72heQGrQXQn/1NNq6rMlS+PaY+DRpMnCUEeEWA== X-Received: by 2002:a1c:19c1:: with SMTP id 184mr14087017wmz.29.1589735886742; Sun, 17 May 2020 10:18:06 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id v126sm13305048wma.9.2020.05.17.10.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:18:06 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:25 +0200 Message-Id: <20200517171725.732-28-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- etc/guix-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index be2fd74905..45b4c4b720 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -139,23 +139,23 @@ 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 - elif [[ $(rc -V 2>/dev/null) =~ OpenRC ]]; then + elif rc -V 2>/dev/null | grep -q OpenRC; then _msg "${INF}init system is: openrc" INIT_SYS="openrc" return 0 - elif [[ -f /etc/init.d/cron && ! -h /etc/init.d/cron ]]; then + elif [ -f /etc/init.d/cron ] && [ ! -h /etc/init.d/cron ]; then _msg "${INF}init system is: sysv-init" INIT_SYS="sysv-init" return 0 - elif [[ -d /etc/sv ]]; then + elif [ -d /etc/sv ]; then _msg "${INF}init system is: runit" INIT_SYS="runit" return 0