From patchwork Thu Mar 27 08:46:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40872 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 765F927BBEA; Thu, 27 Mar 2025 08:50:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E331027BBE2 for ; Thu, 27 Mar 2025 08:50:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiwO-0004J2-LV; Thu, 27 Mar 2025 04:50:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiwM-0004IF-KT for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:18 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txiwL-0003Tf-Hp for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=7BrhaAT3/iL9Z1vX86cHiQ0qtQtFXyL98U58EpkAdXE=; b=ZdtToLzLVwvkUys3k3ud/WPoig+bKCZ/td431YCv7NxhnM93YfEKu8fmRF6FpbdUtD7NKb/+ufOXTUw5GQdnF3oB4O6G0qN2nN3wZQSwCeb6XF/+BlyoN3NuGVohxmxKJSHL/X2QjRKvYXTCu/hsel2zHPJQ70+CpkVyXBbVAVyxdsyWIBTs97jYujTjX8Of+EuOdP7czHxIwE4Bmr2G7DUFOSFCBWTRqVd8AaalQjnns9Pg9CtpHWs9KFkMHz3vSaR1q4Xqr2uxPUBCL4mwDBaSlwKimsXBQrUYov6DqC+qUXKyjkNg+leJXrVRZdR/rEPiDk5NYmEc7Kb1KgWMXA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiwL-0002wO-6W for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 6/6] gnu: starship: Fix shell completion directories. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 08:50:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77181 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77181@debbugs.gnu.org Cc: 45mg <45mg.writes@gmail.com>, Ian Eure Received: via spool by 77181-submit@debbugs.gnu.org id=B77181.174306535910569 (code B ref 77181); Thu, 27 Mar 2025 08:50:16 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:49:19 +0000 Received: from localhost ([127.0.0.1]:47419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txivN-0002kC-T4 for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:18 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:52573) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txivA-0002h3-89 for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:04 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3913cf69784so456678f8f.1 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065338; x=1743670138; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=7BrhaAT3/iL9Z1vX86cHiQ0qtQtFXyL98U58EpkAdXE=; b=i+dRSwOZJkhgmJyU2bW4OgfZjwxW45lTsPcfB2mcU3EHQxj/tGRflznU2eM/vFvXKJ ssyak+Er1Y50j+YPZgugK4V+RsumPjeypqNEecUN29+MZmjIaVgAybt4pJTWzOTvADAk Egckvu43qxj9dHYN/ZxxJX1rDy5cVmvUahgSD1yYx6rpKPqfcJ7WkR2sDGFuLDZT0dAC wUBpNqUGmP0yYnQtfKOpWjqM79Ultuegy1edMs9nkWtTBYpvHI2xwTSoLqO+Sh2U1SEx IB4ouDSdFgnCZ6tckli57Gaxt+elK+xttaeDQP/0oepkT2qobsSD0F5Mri7zuuZVo5RA 8PoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065338; x=1743670138; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7BrhaAT3/iL9Z1vX86cHiQ0qtQtFXyL98U58EpkAdXE=; b=Uij/tAknWCmwzzUtb04MSz7NVEOIARqRgy2YdcUvuUwU6KXSDIiLnMuzTQ1zvv3lba zWIzs5z4G9ndRCFIOO5kf+7tJyd+zoJdmsc0+FQAYIE8R8Krl1AVZgt1pgjjLMPzgXX7 RG4+Or4daehyMJIqddHqiRp9Hx8O/vsutPLxC1QRhXpOiRBY/xfclcn25vkKrqiOU54Y muqtPFJ0A+h9Dm6VxDkuUj+RVNx9b605lIs+fNpJCb854/IF2UoSbXs6lUHISA0TV6jv /9ZMUMk1ZqSzuWBmVWx7uZFI/6hcEiO+qBumK83d1Cxy8HF8upAU2mtCDip2AVjE7P9G NAVw== X-Gm-Message-State: AOJu0Yxw4cqeFm/y9f1/0uxa2nMvSt5xx1pxntQk+qHQKNjLj2rTfSRR vsMaiDj6SG8bEUX1pbzjM3MzCgK+EIhW0dezeyVobA1ils8i9FDVC78pZg1W X-Gm-Gg: ASbGncvpc1AxdAXqxWz598cKDIRTfAN5xiQwQSnYxcwrI/JfvrOYjhRdnm3NdGfebur HsHcT942V5DU32/vy64Dejc5v+w8DSesnEh9rBPk/7XKTdyUVPkiRO+02tCgtOwCEhaQ3va5ZVe CesQ/nueS3e6zGB8yiwryI8+D1ZTaKIT4AYRWQDvmvix+7qwCSylGNjBmAC6Qco+GVcxPwl4YjK kph+gLU6sbx5z7ivUCEjL4iNpD8nAmckOZD/wMjF+9EXTo3JXSfHhAKoDat3PkTWYVvDPgyEbKy PJo54swOedZ0tB0F6rctVmtwQO8SEJJ+q6RURCFIUZl+r3la X-Google-Smtp-Source: AGHT+IGgHXcjGWLqC7ExkK4jt+FfF7sgxBkBxHM4HXBLdB98SBu0Gg50urz5qscK749q9gU/uq3gng== X-Received: by 2002:a5d:6c6c:0:b0:38c:2745:2df3 with SMTP id ffacd0b85a97d-39ad17845f7mr2226725f8f.37.1743065337920; Thu, 27 Mar 2025 01:48:57 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d82f32573sm29655025e9.32.2025.03.27.01.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:57 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:45 +0200 Message-ID: <4f04fc067b4ce22ceb22154d89fcf1c58f8931dd.1743065002.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 45mg <45mg.writes@gmail.com> * gnu/packages/shellutils.scm (starship) [arguments]: Use the shell completion directory variables. Change-Id: Ie286218d636a56745013ebdb23461691fdf16d11 --- gnu/packages/shellutils.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 28c8af8685a..c7723cb2e04 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -496,33 +496,24 @@ (define-public starship (starship-bin (if #$(%current-target-system) (search-input-file native-inputs "/bin/starship") - (string-append out "/bin/starship"))) - (share (string-append out "/share")) - (bash-completion-dir - (string-append out "/etc/bash-completion.d/")) - (zsh-completion-dir - (string-append share "/zsh/site-functions/")) - (fish-completion-dir - (string-append share "/fish/vendor_completions.d/")) - (elvish-completion-dir - (string-append share "/elvish/lib"))) + (string-append out "/bin/starship")))) ;; Make the directories - (mkdir-p bash-completion-dir) - (mkdir-p zsh-completion-dir) - (mkdir-p fish-completion-dir) - (mkdir-p elvish-completion-dir) + (mkdir-p (string-append out #$bash-completion-dir)) + (mkdir-p (string-append out #$zsh-completion-dir)) + (mkdir-p (string-append out #$fish-completion-dir)) + (mkdir-p (string-append out #$elvish-completion-dir)) ;; Use the built starship to generate the completions. (with-output-to-file - (string-append bash-completion-dir "/starship") + (string-append out #$bash-completion-dir "/starship") (lambda _ (invoke starship-bin "completions" "bash"))) (with-output-to-file - (string-append zsh-completion-dir "/_starship") + (string-append out #$zsh-completion-dir "/_starship") (lambda _(invoke starship-bin "completions" "zsh"))) (with-output-to-file - (string-append fish-completion-dir "/starship.fish") + (string-append out #$fish-completion-dir "/starship.fish") (lambda _ (invoke starship-bin "completions" "fish"))) (with-output-to-file - (string-append elvish-completion-dir "/starship") + (string-append out #$elvish-completion-dir "/starship") (lambda _ (invoke starship-bin "completions" "elvish")))))) ;; Some tests require a writable home directory (add-after 'unpack 'patch-test-shell