From patchwork Thu Mar 27 08:46:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40873 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 33C8827BBE2; Thu, 27 Mar 2025 08:50:40 +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=unavailable 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 74D8F27BBE9 for ; Thu, 27 Mar 2025 08:50:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiwM-0004IH-MX; Thu, 27 Mar 2025 04:50:18 -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 1txiwF-0004Eh-9k for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:12 -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 1txiwE-0003TD-FV for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:10 -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=gXgLDuo2SYsQqX5cdnBp2oKQnTeH3HDJ9mMqRI64ONo=; b=OTqtd0K6kunjjRM1vlS6VB8K7go69hSmXov66H2nVsZXkRGvTYHConol5XrSWl8N3YRwLl6I/O/iSNHgGedbfqCTeoYxVUJdC/4ZSgnp2VUtOMb/i3v24AI/aoStUT+yP7UctL6mqG95480w2BMprj4Lken98TZmmB1NP9R7fDcrMG/oMQQYIYpXNShRlZdbfUcHJszmCfnyCvzo4aHDK5r3ToH3M8LZ+Yu18K/p7kXM7ED9KtY/KhwX/BhwJkxIXRKLY0E490yJOFAxBnLATDofU8C+CMbG/OpinYGQJlCgWo/7wF8gWKoouhbAk7jE10pGa/dImrjjvbayaWOK0g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiwB-0002sH-AI; Thu, 27 Mar 2025 04:50:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 3/6] gnu: ouch: 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:07 +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.174306535210496 (code B ref 77181); Thu, 27 Mar 2025 08:50:07 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:49:12 +0000 Received: from localhost ([127.0.0.1]:47413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txivD-0002iR-MT for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:11 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:47471) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txiuw-0002ec-MQ for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:48:53 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso7266785e9.3 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065324; x=1743670124; 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=gXgLDuo2SYsQqX5cdnBp2oKQnTeH3HDJ9mMqRI64ONo=; b=IkPe9xie0zDNc/jf7HJOsxPdWRWBOAbGDqGQEN1kGJYOYnxCfPnI0Kg1pw8p8/WN73 0RIGMFNrhZcY8KLqjtmV31oVrjvQDuQvSDw+1mzZlZ1dLe/BvtFCZWgtoTEAJuiUTQjq YXtUmGovy+3X2SUd7qHZFAdru3o2EMm5hp3McUs0BcGilH5i85fpZcZRx6iEEgUqNSsm GZ/Uutq/Z0cVfh3vzXZkYFtukfb5lgGrgOCeBmiSNPKePuT2oxySCplAi/AZDqwvhC52 UVnQsK2+DWWKcZs/5dqUGzlqUxjHZTJr1m6quO8K+J1o/rKSIisjeoFQIBHp7ekrZYzq 7J5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065324; x=1743670124; 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=gXgLDuo2SYsQqX5cdnBp2oKQnTeH3HDJ9mMqRI64ONo=; b=HHamtB/qIn4C0snTJIewt9Sf7tWkxt6hYGsDBDYzK5zzpE08/hnjflBLVUWUAbrr3Z WfSozm2BmFI8McJry3ZVd4iQw2JuLT09erxaLQyDpRDgNx/JUCjjDZe6OpCbUmoSUZKm EV449NTsS2WIdSgRWWSIxURDyMgGip5/aN56qiP1driLWdCGjNAgsJ4xHU2YbgBLCUkM a8aYrl2jzDrarHo6m8T895upHMLIEhYwQD6UJxatR9GZ3jJmk0XT1dY/bA9+1fh4tJcP F/7ZjTYmYL044NZXxuQ/Ew9UnsXJs8hWSEdKrITlxSldDoWcJQVWmuzGQfoFJEiWCi6I Wm4w== X-Gm-Message-State: AOJu0YzOf5DvlHlydJn9WH/4JNYbKFxqMUVYBEQTbpdzIZ+xNJHGeaGa d9nlOcLQ7sdeK0PzLZMoNBQ8n7x+XEI+huIkhkQ6WVKLtajswHRYuJ3vQzPF X-Gm-Gg: ASbGncuhuUcR7L84G02XOcomkXlz0TY/XByFkxikXkFwNUSXBxQ6lgS8q8W2oPNIcug Ky7hyjomgOVdrtymCBeYHW9dBiIQIzfY1PvIDgWbTQHcOrjV9/5XhGwqa5FYH2aXNZ5Y1jgSznG h9RplyVxhid6KyHnBfqJTdrl6F4I+X/GQdK48o/4s48Zug3vn+/+Vyums+wt95H1O+Dv71G1Sui 9KAwyySVsPgfaMivuozdPtnY4WSy4txMol9sjtu8N833+VI8U3l6FHAqRbYaGklKPqWS2lFKcMS Wb8EmJP5SU2MkzbSFnYyAkyz6csWFIs1gCF8yvqDpN+jJbz3 X-Google-Smtp-Source: AGHT+IHa1yWivBzqba0QLRblHPFJoIIydntdFxrlAB3Tm0QrGMZfAK8zV45fI2I/eCdmmjpr3vMziA== X-Received: by 2002:a5d:59a7:0:b0:38d:eb33:79c2 with SMTP id ffacd0b85a97d-39ad174e4famr1965093f8f.32.1743065324231; Thu, 27 Mar 2025 01:48:44 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39abfc2115asm13224512f8f.4.2025.03.27.01.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:43 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:42 +0200 Message-ID: <76d0f9fece99b9f7716fd5b6e166e1b872c64520.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/rust-apps.scm (ouch) [arguments]: Use the shell completion directory variables. Change-Id: I63f2be695e9d8dc15de61bbbb470c54e47a6a197 --- gnu/packages/rust-apps.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 2f933d836c5..0371fd4c264 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2348,25 +2348,17 @@ (define-public ouch (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (share (string-append out "/share")) - (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"))) - (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)) (copy-file "target/ouch.bash" - (string-append bash-completions-dir "/ouch")) + (string-append out ,bash-completion-dir "ouch")) (install-file "target/_ouch" - (string-append zsh-completions-dir "/_ouch")) + (string-append out ,zsh-completion-dir)) (install-file "target/ouch.fish" - fish-completions-dir) + (string-append out ,fish-completion-dir)) (copy-file "target/ouch.elv" - (string-append elvish-completions-dir "/ouch")) + (string-append out ,elvish-completion-dir "ouch")) (for-each (lambda (manpage) (install-file manpage man1)) (find-files "target" "\\.1$"))))))))