From patchwork Sun May 31 20:42:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22480 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 3AE0B27BBE1; Sun, 31 May 2020 21:44:19 +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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 3E11D27BBE4 for ; Sun, 31 May 2020 21:44:18 +0100 (BST) Received: from localhost ([::1]:51074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfUob-0006uf-PK for patchwork@mira.cbaines.net; Sun, 31 May 2020 16:44:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfUoN-0006cI-Fl for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfUoN-0000qH-6H for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfUoN-0007Jt-4V for guix-patches@gnu.org; Sun, 31 May 2020 16:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 4/7] guix-install.sh: trivial whitespace fix. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 May 2020 20:44: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 Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.159095781428043 (code B ref 40601); Sun, 31 May 2020 20:44:03 +0000 Received: (at 40601) by debbugs.gnu.org; 31 May 2020 20:43:34 +0000 Received: from localhost ([127.0.0.1]:33935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnt-0007I9-Su for submit@debbugs.gnu.org; Sun, 31 May 2020 16:43:34 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfUnr-0007HO-H8 for 40601@debbugs.gnu.org; Sun, 31 May 2020 16:43:31 -0400 Received: by mail-wr1-f67.google.com with SMTP id x6so9377749wrm.13 for <40601@debbugs.gnu.org>; Sun, 31 May 2020 13:43:31 -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=2/qLmiMk4MM5dHyyygZ79L/cRmb1Z9Gsz1obqa2+FXc=; b=euysIlUFMSwNwZKXSx69yZSt51lNzlK2WisyKbquZiVVEC++lYepwq/fukNkUVslp7 XtKZ6OvG2QkOJf8ERcpjlujvvIZLpM5Dr0B6QXgE2SGfz2MJAyGDVSk1HJijM5ZHO7CX n0nSd+bJ/TokHJF5Z5MJmQSbD+oooJrFRmMZeUkV8h2DbZyuqbTjv1++KqCGkJxEixLV wKEGSweWAgt44iVN2aZ1sKsMdZWZbO6DwVWDAGA2O6DOli+sSSNM38jeXubTeL++vBPa hpi12SATAgXt1jV9Rr4j5KIH14rs9Y4OkEn5jMMFX2VCRtrrhqm2N9MbMirI6hmFs9Zr hAgA== 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=2/qLmiMk4MM5dHyyygZ79L/cRmb1Z9Gsz1obqa2+FXc=; b=r2zHQjo73IfmXOkah6QeRCDo7HuVqIi0wOgbhPZu+UMJKodTKKT/+Lb9j540FNnvt8 c03R5eTZ/GkIrDQjyDaz2sNwqLILqScx1ZDft1K3NilwjdS+pdw5CqokCFHYiip9Nqvm JHPx7IuXUHSC7ojlcwy+CJ6YKw5I5j7W4ZeYppfXeV4AanA3JZ8qxv7T9YWxgAb34dTM E0VX9vL36yGQ4BGJz/a1YZ4RL4oV5w/JExtOnd3/ej4bvRLo/xTSEGM1c+geJExO71FE omHyCUQRT0QB+p8i7GC5vqn57MmKZI/0UzMTkFusyvF1H55CfbmeOrLLFSuhCunU17Pd y2ew== X-Gm-Message-State: AOAM5324z3Wq3ZHAoQUdwOhXElKqMOb2H2Z8O73EQCdElg/A1E4PQ5Uv Y0Nd/iHMYz3ZGsdOh/RWiGN2uKRk X-Google-Smtp-Source: ABdhPJwTGli9gD4UUNPUBKnItVhYroOM1YtOE4U7M23vGpXwQiAXXOvW/JtDmJC0KW2pBqxDnGegGw== X-Received: by 2002:adf:e908:: with SMTP id f8mr18582718wrm.184.1590957805650; Sun, 31 May 2020 13:43:25 -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 w10sm18728850wrp.16.2020.05.31.13.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 13:43:25 -0700 (PDT) From: Vincent Legoll Date: Sun, 31 May 2020 22:42:54 +0200 Message-Id: <20200531204257.18725-4-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200531204257.18725-1-vincent.legoll@gmail.com> References: <20200531204257.18725-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 Almost the entire file is indented with spaces, a few tabs slipped in, clean them up. Checked triviality with git diff -b. * etc/guix-install.sh(chk_sys_arch): Replace tabs with spaces. (sys_enable_guix_daemon): Likewise. --- etc/guix-install.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 28fcf831c5..14616f790b 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -173,9 +173,9 @@ chk_sys_arch() aarch64) local arch=aarch64 ;; - armv7l) - local arch=armhf - ;; + armv7l) + local arch=armhf + ;; *) _err "${ERR}Unsupported CPU type: ${arch}" exit 1 @@ -355,15 +355,15 @@ sys_enable_guix_daemon() /etc/systemd/system/; chmod 664 /etc/systemd/system/guix-daemon.service; - # Work around , present in 1.0.1. - sed -i /etc/systemd/system/guix-daemon.service \ - -e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/"; + # Work around , present in 1.0.1. + sed -i /etc/systemd/system/guix-daemon.service \ + -e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/"; - # Work around , present in 1.0.1. - if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null; - then sed -i /etc/systemd/system/guix-daemon.service \ - -e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8'; - fi; + # Work around , present in 1.0.1. + if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null; + then sed -i /etc/systemd/system/guix-daemon.service \ + -e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8'; + fi; systemctl daemon-reload && systemctl start gnu-store.mount guix-daemon &&