From patchwork Wed May 5 04:32:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 29122 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 CFA1327BC83; Wed, 5 May 2021 05:33:09 +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,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 7DBBF27BC81 for ; Wed, 5 May 2021 05:33:09 +0100 (BST) Received: from localhost ([::1]:49084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1le9Dg-00082U-MA for patchwork@mira.cbaines.net; Wed, 05 May 2021 00:33:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1le9Da-00082D-FH for guix-patches@gnu.org; Wed, 05 May 2021 00:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1le9Da-0002tq-7w for guix-patches@gnu.org; Wed, 05 May 2021 00:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1le9Da-0006li-4V for guix-patches@gnu.org; Wed, 05 May 2021 00:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48233] [PATCH 3/3] guix-install.sh: Exit early if Guix is already installed. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 May 2021 04:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48233 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48233@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 48233-submit@debbugs.gnu.org id=B48233.162018914725993 (code B ref 48233); Wed, 05 May 2021 04:33:02 +0000 Received: (at 48233) by debbugs.gnu.org; 5 May 2021 04:32:27 +0000 Received: from localhost ([127.0.0.1]:57444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1le9D1-0006l5-7b for submit@debbugs.gnu.org; Wed, 05 May 2021 00:32:27 -0400 Received: from mail-qk1-f178.google.com ([209.85.222.178]:35728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1le9Cr-0006kj-Jk for 48233@debbugs.gnu.org; Wed, 05 May 2021 00:32:20 -0400 Received: by mail-qk1-f178.google.com with SMTP id x8so441562qkl.2 for <48233@debbugs.gnu.org>; Tue, 04 May 2021 21:32:17 -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=zfwf7htFMvncxtEZufjiMkHtH3YTO/d4IsNcRc7h1/4=; b=eL2VGH9XjkIVMQAvjfP7kjZfGFmg7Vm5z9X4pCE6stPLzQQi+bkCAPE2xO7k+I6JhG PeyVdPxNPcPWr0y90oEn2dHdCaUt6wm6EdVbPolwLXuqByxt5U6UmQacjqmSv+r9TL2X TuWzxVBqijh3zLgXSMAMz/tV/tlKrkTWNW5LbZNi96TR+1uHEbqLQGZiVj83T6YVRal0 Z+pIm89lJwRWaVVGSQfM6720Hsb5ct3Q0CjaTuk6D+EJet47B3wIzvWimfclC9KMfabd Ldtpvtso/mQZFqP0NGDCCWA03a4e1QKol+z7d/G6EgprGSnX5cmB/JP3ygk//QOhh73V YTBQ== 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=zfwf7htFMvncxtEZufjiMkHtH3YTO/d4IsNcRc7h1/4=; b=MYfW3et73CrB+uWt0e7LM/lwa3YisWMQnMtk6A6CCr96cDGQoj8lvzSfHRB7Y13F9o Yr49Ku/4iBil7s1vgnBGP1V7lBz/qATbvLx5kHk0pDNBBuApIppqxBF7Pzg2EYkC51zd Hn0CU9lDQxiUphRGGGlEvIM05HjgUPNZwuNPGZMBOQhKgFz61w3VZpYXuQm3lNjNIu5z y3/y513lMhgUPV3ORExydTVUzzB3iSIz7IUnjBuOgK/ShftB1QFYT83v9phPU6v59aWW Bum6J6i0wazVxmGi1DGr0shcP4OIk4mAbXkORP5BHFL1vvU885/DQm3LB73GwLSNeAfX WJVA== X-Gm-Message-State: AOAM530/m1GU9kL9eJX8p0yxGba+1RWfHZ17IrB+IxizXYHsKY0/9KJW B2coSqVH8Y7zMgL2Bp4BWm2JoDGAgkug0Wb6 X-Google-Smtp-Source: ABdhPJwR3Q6I1cLrF7kor5pBDSvL4EIebmPvGzOSPoDx3B+0C8LV/7d4duvZuRZ8QIkvRTU+enBqMQ== X-Received: by 2002:a37:e30f:: with SMTP id y15mr27561896qki.480.1620189132041; Tue, 04 May 2021 21:32:12 -0700 (PDT) Received: from localhost.localdomain (mtl.savoirfairelinux.net. [208.88.110.46]) by smtp.gmail.com with ESMTPSA id l71sm12702122qke.27.2021.05.04.21.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 21:32:11 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 5 May 2021 00:32:02 -0400 Message-Id: <20210505043202.24636-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210505043202.24636-1-maxim.cournoyer@gmail.com> References: <20210505043202.24636-1-maxim.cournoyer@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 (sys_create_store): Move the check & exit before The Guix binary archive is unpacked. Re-indent tar extraction command. --- etc/guix-install.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 3d2936c873..f7ef0c2671 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -321,20 +321,18 @@ sys_create_store() _debug "--- [ ${FUNCNAME[0]} ] ---" - cd "$tmp_path" - tar --extract \ - --file "$pkg" && - _msg "${PAS}unpacked archive" - if [[ -e "/var/guix" || -e "/gnu" ]]; then _err "${ERR}A previous Guix installation was found. Refusing to overwrite." exit 1 - else - _msg "${INF}Installing /var/guix and /gnu..." - mv "${tmp_path}/var/guix" /var/ - mv "${tmp_path}/gnu" / fi + cd "$tmp_path" + tar --extract --file "$pkg" && _msg "${PAS}unpacked archive" + + _msg "${INF}Installing /var/guix and /gnu..." + mv "${tmp_path}/var/guix" /var/ + mv "${tmp_path}/gnu" / + _msg "${INF}Linking the root user's profile" mkdir -p "~root/.config/guix" ln -sf /var/guix/profiles/per-user/root/current-guix \