From patchwork Sun May 17 17:17:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22150 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 E8C9127BBE1; Sun, 17 May 2020 18:18:27 +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 02CB927BBE3 for ; Sun, 17 May 2020 18:18:27 +0100 (BST) Received: from localhost ([::1]:38856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMvi-0007UP-AO for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:18:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMvO-0007Sr-Jn for guix-patches@gnu.org; Sun, 17 May 2020 13:18:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMvM-0004CE-7Z for guix-patches@gnu.org; Sun, 17 May 2020 13:18:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMvM-00073n-1g for guix-patches@gnu.org; Sun, 17 May 2020 13:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 04/28] guix-install.sh: Handle local binary tarball file. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:18: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.158973587927086 (code B ref 40601); Sun, 17 May 2020 17:18:03 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:17:59 +0000 Received: from localhost ([127.0.0.1]:44548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvD-00072K-DM for submit@debbugs.gnu.org; Sun, 17 May 2020 13:17:58 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:56110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMv8-00071D-Q9 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:17:51 -0400 Received: by mail-wm1-f42.google.com with SMTP id f13so6973508wmc.5 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:17:50 -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=lwoOyC+nbnUDSu6+nfoEADl5SzsOrZnhHg5VEX6FKmk=; b=hKyfCJGxR2jp7VnSP1JyLOcEOjp8gy+QfaFk0DTdgnrlUCHpdr6g1vmD2hHEb6NxNM QPl1oLN1IGZCHb7gXDiaM2qecvsJWZpy6HENZWCICz26VHUinoORqqyASZrfCg7lwbXu xYszoauB5E50dVSO5ZrJ7sAgr8AApPZw3uGrEvunMkDiCJqWB4Zkj6bf4ynchUcbUprD DIRn5VjGej4hj7l6vQatRdZM+s2RQ6evuIBMc5BbhhRRVOl54zED4PWrYd+wE1iBQ8yn xnovGL/lePaJjvJR3Vbk6nj4yZT4oFwCtjl2TigXXptNjlcDlT9bKkTQ+BLxpVIJl4iD 3jhA== 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=lwoOyC+nbnUDSu6+nfoEADl5SzsOrZnhHg5VEX6FKmk=; b=AvUc0OVxJ9k74j+E/HCu2DrvseA9/Fd44bq4L0zSZDfa0YButxg1HWAtAae19pnkZe QyTM+rs09o0PYyMCedXbRqgTuzYGxfeYmySOmppO7n0ANJmJTq+AedkMctjKTDHepr4o mcgAgMyZzRONSrfDZoG09NtPOnT9tICW0xSi+5vKm2HnStrOSZ+jENvcqNJ4XXUEevWj tKA3GgkVVTOVA1i01yA7cBSNZKv1ocls1vopoJiv+rXt0cFU+q8Y2CEXgQBkIoZQamNG JCQGVP5CV0yzu2DEpReR+33oJ3MZZexNift2moVm+Fn2losVOeWsL+VtIw9ChR2kGdIO j01w== X-Gm-Message-State: AOAM532U2ErT2eMSmtojSmBTTV+ka2eJ9xRhrOUzZKkuyHV+aqMxF4sb Q7u2Ob6KwCUYykZFfzvwXaj4jS9L X-Google-Smtp-Source: ABdhPJyzWOhPgIYh2s5c2ABzMTgZQ6Zgh5mjEljC1JIxaA1yEBcTOJEF8fOzaKTscc43US7DuMP0AA== X-Received: by 2002:a1c:2dc7:: with SMTP id t190mr14234318wmt.129.1589735864988; Sun, 17 May 2020 10:17:44 -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.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:44 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:01 +0200 Message-Id: <20200517171725.732-4-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 (REQUIRE): add realpath. (main): Handle local binary tarball file path passed as first arg. --- etc/guix-install.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 4fa9664cf5..7b9a729570 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -4,6 +4,7 @@ # Copyright © 2018 Ricardo Wurmus # Copyright © 2018 Efraim Flashner # Copyright © 2019 Tobias Geerinckx-Rice +# Copyright © 2020 Vincent Legoll # # This file is part of GNU Guix. # @@ -47,6 +48,7 @@ REQUIRE=( "uname" "groupadd" "tail" + "realpath" "tr" "xz" ) @@ -482,10 +484,14 @@ main() umask 0022 tmp_path="$(mktemp -t -d guix.XXX)" - guix_get_bin_list "${GNU_URL}" - guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path" - - sys_create_store "${BIN_VER}.tar.xz" "${tmp_path}" + if [ -z "$1" ]; then + guix_get_bin_list "${GNU_URL}" + guix_get_bin "${GNU_URL}" "${BIN_VER}" "${tmp_path}" + TARBALL="${BIN_VER}.tar.xz" + else + TARBALL="$(realpath $1)" + fi + sys_create_store "${TARBALL}" "${tmp_path}" sys_create_build_user sys_enable_guix_daemon sys_authorize_build_farms