From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 13 12:08:03 2020 Received: (at 40601) by debbugs.gnu.org; 13 Apr 2020 16:08:04 +0000 Received: from localhost ([127.0.0.1]:60564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cx-0006v3-7q for submit@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:03 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:53272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cu-0006u8-U1 for 40601@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:01 -0400 Received: by mail-wm1-f53.google.com with SMTP id d77so9780258wmd.3 for <40601@debbugs.gnu.org>; Mon, 13 Apr 2020 09:08:00 -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=wV4+1jyL8qU7WCJsvI95UQYIXcSBn6faITajzYEeedA=; b=cbEL3BTTH2m0IOj9v1zg7i4mrXLswIS99BrOlNJ3g7d66YVs8/77uZrfcRogXFTuSS An9FVVbJg7y7qBt2K0SprEazuP8j4eFJueIIEIDYMfC6skm/yH6GTciirpLlfuWIXg+Z ABcGbMp/FGK3uN1nzLk7QviB6nx05ggkKg0OUKj8DMHjW/H516zmPdyEKrwCBUj1IIaj 6A4NinFqrAfTRNq6fA4fdEJWNrRCN7BoskP/bU0VFAN2s9ng/bhcFJ92YRFnCwQ22VFK 7aZWouWdUrn3oXjoOo0iIH3dH/Dcw3+80iJ0+5kCroH3yf02tDcagUOnqn6bcNttwILA ldew== 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=wV4+1jyL8qU7WCJsvI95UQYIXcSBn6faITajzYEeedA=; b=G3tQUIarNaLv4bJJOy7tAvSjQnSZBiZStRDGaCagBzaYMf3l/D0G5jen1IU/z+Z2j7 08iD92k5HKhoZlwwP9Uu/t7VH37kD1Q0qYWpMfdur0PMz/Dq8v71pBNAkISq9JWhmLN+ tRXaShGjKzpdz2DZVmnlQWo3qx0sixqk1xR3WITfSHPShDR29O2Rg8x38kU671dOUGYp ewXN0OXplR+gcUA43C1b0DCYWnstvD8mO1sznhvkf/1qO1sNPVksfErdPmy843OUzOD9 f6gJKrPUAhbA7JpNdAfaqmd+P+1QRGYlKgNW7XWLKjgYDIzG8RSrv2yWtIFfxeTnNh5V weuQ== X-Gm-Message-State: AGi0PuYuHAylY08/ZdwT0hVKp+V1D2qSS/7xHCZ7vGYFTTF9nLKC3fVQ lvOPsJMDhGlxy0sOA7fFJD7ekvts X-Google-Smtp-Source: APiQypJi3B321cNV7cNvgYziACQfmBAgWzJ0NXdXepUHOKcWHwsE3OSJS7v4k0C/1R50EuGTUJg0zg== X-Received: by 2002:a1c:6787:: with SMTP id b129mr20203785wmc.165.1586794075046; Mon, 13 Apr 2020 09:07:55 -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 g74sm15248774wme.44.2020.04.13.09.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 09:07:54 -0700 (PDT) From: Vincent Legoll To: 40601@debbugs.gnu.org Subject: [PATCH 4/5] guix-install.sh: Handle local binary tarball file. Date: Mon, 13 Apr 2020 18:07:39 +0200 Message-Id: <20200413160740.19584-4-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200413160740.19584-1-vincent.legoll@gmail.com> References: <20200413160740.19584-1-vincent.legoll@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40601 Cc: Vincent Legoll X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * 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..0d15a05cb4 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 -- 2.26.0