From patchwork Thu Mar 27 08:46:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40876 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 6FE8427BBEA; Thu, 27 Mar 2025 08:51:00 +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 95F0B27BBE2 for ; Thu, 27 Mar 2025 08:50:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiwR-0004Jr-5K; Thu, 27 Mar 2025 04:50:23 -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 1txiwI-0004Gx-Px for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:16 -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 1txiwI-0003TQ-Em for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:14 -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=Duxy7A94xBDehCittGSTp7AqP/60PPHb1igrtIYocmc=; b=beAJiHm8Wqdi+kVRSUjJh/Pi2+1KCcQ5k3Zt+wogJk/yRHxbiw08CXJjeuJ/IytT7kWe183/XKPO3VEp/23LtDMinp8EkMVCMh45HeiWc/yJarQpaZzOS7g87t/2zy1S+/b+k6CbF1+ogSM62mJhg8+BOAIxx/mVLqCqVmZnx9ApLsTqSHRVoXdc1SMiiwITj1Y4Zcz+P9LU8oyRK7YbJMff7zDRL9DpcJQwKlolXTUvLP8YTQzRDX2rHqBgog8cXbFUuMkqz37n7h8tbx1WAO2FmjxuykmF0cEcXgLpoafLE5oHQ5/XW90FFuVHUlpXm0uM2y/cOTPK964SfoWi0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiwH-0002v8-UI; Thu, 27 Mar 2025 04:50:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 5/6] gnu: zoxide: Fix shell completion directories. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 08:50:13 +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 , Divya Ranjan Pattanaik , Efraim Flashner , Steve George X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner , Steve George Received: via spool by 77181-submit@debbugs.gnu.org id=B77181.174306535810555 (code B ref 77181); Thu, 27 Mar 2025 08:50:13 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:49:18 +0000 Received: from localhost ([127.0.0.1]:47417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txivK-0002jf-Ab for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:17 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:51610) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txiv4-0002g1-3a for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:02 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43d04ea9d9aso2930775e9.3 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065332; x=1743670132; 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=Duxy7A94xBDehCittGSTp7AqP/60PPHb1igrtIYocmc=; b=M/B5iN7vEUxzW91OjUHz+Q3DK+IBpQuj5RDo2N2tvUXFobQS67yqOJVNkGCqfK100P qz6p/E8mvrYZba/Yc5jDWLo14rT4cXMhg8vUNYn3SPisbOCAKptH9wdoFDeWt9WP3yXJ ZHtIF2Nzdh+HeyO3q2hJj2BqxJA5JND6I1gFWcSkrOReSVPInf3fxYlzMHNHGQr771+t kNNqnnlfPeiR//Kc/GRkv/P0RTP8owOqehOomxm7ptC8rXukq+HWQT3kQ8PBZv4wd/G3 Fpw/J8iK5rcaDoY5RABAsO/3aJjd87s6a1q1TkjhD+1wY9GYK9FkN/m5AtCIPVjI3vkB 09Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065332; x=1743670132; 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=Duxy7A94xBDehCittGSTp7AqP/60PPHb1igrtIYocmc=; b=AsuxeMZqVwUJxUjB8ogmoVqU1UAZe1xXViY++77mTMzJyRrUOdjYCJfsE4xz6QqH2Q 90oBiLJG6G8H5GGIw6Zf5e7CTbTNRNR4BJN9NWw3hGJYeYBaIXSEX5dhJjz8PRo3pOQp edK3miozX/kmuyaqVmYEk59doSDzasriP4ghiJanQ5IemJtI75EnuGCqosXFXu1ehAwr fgsvJo7BHW+FI1O7QqnRZpmhvKDTZTLiO6od3vgiSTUfMZC2hthn8/emvU6hjTsi3YwL G4DX1onkxbNxbI4LJSAwVi/AU5+JVDuYQVXusda1NBDy3Rm+Uzski/7x7xySWKOtqD/h k7wQ== X-Gm-Message-State: AOJu0Yzsg6e895+sTDlM0492ENbq3WOCo84CQz3ewHxAlIhBiqkUfcbq kBN1g7k4S8bkYxi2Bul3NK87CUGgDBwNz41hfWXJI9lpGhpb1PPAtbUFGxEd X-Gm-Gg: ASbGncsghXzPOsd5T4KAEGOUP6Op51bRcloZUohqNNEb5jinV/aazN6PR4kf3dlP4Xn Gd5aetdrJAG2cSOMAo1MZaCWF6g0+G7nSLJpN1dKgDaTB9wVBuadxTg/3lHJIrocQoqX7yjMeui tls/htqkg6GOzHSZBu40eOuUmgdOq7EIeV4fNT/zzfj1Wm2ekK1Emu6mBLwVzXCA77UcTLgZglR vB3SiEL9DyDjJEwbYz7SJbn2nf4rKnJ00bDXq9JV6k3lhfUQhGb3dr/Tc2QVd+z3qsJTzfVY6E5 oeKdVHgVae5b7bq/jJo2u4UgR4v3qPwg3mNP8E8AUBhiH36n X-Google-Smtp-Source: AGHT+IHBdVhdoHD6a7NG0Go4B83pMDqGKzK35Zv0PT209FuLLyS1xt1v0XXau0r3zas43dftlyQm6Q== X-Received: by 2002:a5d:59ae:0:b0:391:4873:7943 with SMTP id ffacd0b85a97d-39ad175004emr2195790f8f.32.1743065331623; Thu, 27 Mar 2025 01:48:51 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d82a041d4sm32103515e9.0.2025.03.27.01.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:51 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:44 +0200 Message-ID: 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/rust-apps.scm (zoxide) [arguments]: Use the shell completion directory variables. Change-Id: I55f1a9f5c37a6b795f0021ea8b08f472c16847e9 --- gnu/packages/rust-apps.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 55861ecc924..48fefd3064a 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -4864,30 +4864,22 @@ (define-public zoxide (lambda _ (let* ((out #$output) (share (string-append out "/share")) - (man1 (string-append share "/man/man1")) - (bash-completions-dir - (string-append out "/etc/bash-completion.d")) - (zsh-completions-dir - (string-append share "/zsh/site-functions")) - (fish-completions-dir - (string-append share "/fish/vendor_completions.d")) - (elvish-completions-dir - (string-append share "/elvish/lib"))) + (man1 (string-append share "/man/man1"))) ;; The completions are generated in build.rs. (mkdir-p man1) - (mkdir-p bash-completions-dir) - (mkdir-p elvish-completions-dir) + (mkdir-p (string-append out #$bash-completion-dir)) + (mkdir-p (string-append out #$elvish-completion-dir)) (for-each (lambda (file) (install-file file man1)) (find-files "man/man1")) (copy-file "contrib/completions/zoxide.bash" - (string-append bash-completions-dir "/zoxide")) + (string-append out #$bash-completion-dir "/zoxide")) (install-file "contrib/completions/zoxide.fish" - fish-completions-dir) + (string-append out #$fish-completion-dir)) (install-file "contrib/completions/_zoxide" - zsh-completions-dir) + (string-append out #$zsh-completion-dir)) (copy-file "contrib/completions/zoxide.elv" - (string-append elvish-completions-dir + (string-append out #$elvish-completion-dir "/zoxide")))))))) (home-page "https://github.com/ajeetdsouza/zoxide/") (synopsis "Fast way to navigate your file system")