From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id KLajAKQ6GmUACgAA9RJhRA:P1 (envelope-from ) for ; Mon, 02 Oct 2023 05:36:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id KLajAKQ6GmUACgAA9RJhRA (envelope-from ) for ; Mon, 02 Oct 2023 05:36:04 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8A50B5B923 for ; Mon, 2 Oct 2023 05:36:03 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="jCW7+sz/"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696217763; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=49oZXWbjEc+i0FxamlYfxit0dO5kynbFEOjFUrG3zBM=; b=IARnkriJl6nQBX2vEl1JaJSaXKiirmxX/wKD1tUD3kV+CzJAw3lGuwTG4JHiovwCFdENgZ CSIg2GVOrKu2j0c/aQgbJvDQtocpEidh+mDIrwoSZeRNo2n47uHemYzmHWDW/PHjXjk/Xe ZkIafDEgAHL3vjhkDwpoWGX207aD0gG6mvYYbgyMqOM+/IlDCNmsTseJaFZ+bvRfYnnOg4 Op8zxwH1OAHVIolHyrYmBYqZvg8ct1zEeaH9KqKbh9z9J1ygMjgFK5B0nXjUVgZ5+zMUpg Bk7MmA1iEKsoUcfAeqa1P8wRngPP3dJPrkAEQ1E5Uw5+5xQ5dwKXOFFRCGyG7w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="jCW7+sz/"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696217763; a=rsa-sha256; cv=none; b=hWx3QmfrCZAZGRBVvUmnwyR9r/YtlcZ22NQKk8Rb1/Ni8gggqusOWpeEo1ahOCLwtUzjM+ mcZPfWa5DvekzpHNRyVXe7Ma7K8Xm7Lqvmw5fx1TU6o/lbSpJr2Q4Pj+NOd2FUl17vIqSd kM4OTx5IJnu9htjbRvdvrH05UrgtCS1nClQoKV8YFJTAY2LnsFp5AxzcNyi+ie9iGWsgOq iJaxcuasrBpNHCCE2bFMi6p6YmIbQ49+4CHN+amYUZxpPq8NEv6QRIyWHMv/1tTQ106q0J Ou1WRkNAAFp7vbhein5RGnMzKTPs2PrJdbPcDjGpK3BekdRwCHJJm0yjJxUTfg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qn9im-0003mL-DI; Sun, 01 Oct 2023 23:35:48 -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 1qn9ik-0003mA-CY for guix-patches@gnu.org; Sun, 01 Oct 2023 23:35:46 -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 1qn9ij-0001As-L7 for guix-patches@gnu.org; Sun, 01 Oct 2023 23:35:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qn9iz-0005pw-UU for guix-patches@gnu.org; Sun, 01 Oct 2023 23:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66171] [PATCH v3] gnu: git: Install zsh completions and git-prompt. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Oct 2023 03:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66171 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: Efraim Flashner , 66171@debbugs.gnu.org, Simon Tournier Received: via spool by 66171-submit@debbugs.gnu.org id=B66171.169621772222369 (code B ref 66171); Mon, 02 Oct 2023 03:36:01 +0000 Received: (at 66171) by debbugs.gnu.org; 2 Oct 2023 03:35:22 +0000 Received: from localhost ([127.0.0.1]:35613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn9iL-0005oj-Ub for submit@debbugs.gnu.org; Sun, 01 Oct 2023 23:35:22 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:50321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn9iK-0005oS-F4 for 66171@debbugs.gnu.org; Sun, 01 Oct 2023 23:35:20 -0400 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-65d0da28fa8so27827766d6.0 for <66171@debbugs.gnu.org>; Sun, 01 Oct 2023 20:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696217698; x=1696822498; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=49oZXWbjEc+i0FxamlYfxit0dO5kynbFEOjFUrG3zBM=; b=jCW7+sz//ntMeBQJSeoy2XseVbVymofDBkPtg8dRA2dMb+YMug5oIxxtA3lTU3ownG 7y0h4Ctuxj36dOkIEOCIXv7fknrP65j5o806FIjBoUj3kMksIzGgW6pbRPDX2hGF+dGn 7P2QtcYApx2NfMitJjDsKgjm8zmKt90TAEw59/8yNi/69Sr6g9CH/rJB0y58B3Cto2Ic 3G8hv3vby0r/RyojBeJEKhlkNwdeUSaGXBB1sT0hj2E/Zr8VEYwBZemy4ECLNZjJsOp6 kmW0bpb2qbhG4wUom0cRakNuzk4X+40Rlw5UEmqlMCQKUYyuj64odPpJwOur4A6sjNOd RXuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696217698; x=1696822498; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=49oZXWbjEc+i0FxamlYfxit0dO5kynbFEOjFUrG3zBM=; b=b852HloXKnetIIHpG7VVwQGKxoMOjqeOA0nIuOq8l6RCPCiJQNNsVoDugMTtRut6tH beTNXkVGl0kBl3IdA/woqcdKjfpSFSs2XcI57EJa27SlBJ8MMbfsnIlzYi4lOLe4Gz6s imbj/SRrfddLqOBP8f2qma+C0kA86zeV2U3kZh7JyRa6VaMF9RxHp5CamszqmIhVS6k4 rdEc1OLw6S5zSwUQnf0AndQUveXTpI5bteUJRdvdP1KASw+xwZqjuErkUuFnpnY/Dpgu +Yn09xbmA+gQUYB3cLnyWmQbiJ/PJt5FINpmoxmuCha4y0KSJLZB3abWBhjZhOC3KSqU iEKA== X-Gm-Message-State: AOJu0YwufZRbUJM7WCPBe2nrs+ZXDOL6e9LqJIHljhJB5FZg/sPlhmvn RKfptwhirn1MLNVt/IHyX88= X-Google-Smtp-Source: AGHT+IHl2XMifnTYtp+6vtkZWbPn50xcaYWxKRpDDCk09/06qlcyk0c40ioCc5rNwVidJDee/FsJiA== X-Received: by 2002:a05:6214:3f87:b0:658:22d8:9 with SMTP id ow7-20020a0562143f8700b0065822d80009mr11152132qvb.61.1696217698431; Sun, 01 Oct 2023 20:34:58 -0700 (PDT) Received: from hurd (dsl-10-136-90.b2b2c.ca. [72.10.136.90]) by smtp.gmail.com with ESMTPSA id t9-20020a0cde09000000b0065d0dcc28e3sm3068776qvk.73.2023.10.01.20.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 20:34:58 -0700 (PDT) From: Maxim Cournoyer References: <00b2291bb7eaa66b3f62ea4d94e44bf85ec62b51.1695927171.git.liliana.prikler@gmail.com> Date: Sun, 01 Oct 2023 23:34:56 -0400 In-Reply-To: <00b2291bb7eaa66b3f62ea4d94e44bf85ec62b51.1695927171.git.liliana.prikler@gmail.com> (Liliana Marie Prikler's message of "Sat, 23 Sep 2023 21:43:07 +0200") Message-ID: <875y3p66jj.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.10 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 8A50B5B923 X-Spam-Score: -2.10 X-TUID: DyLW+FRLrnhX Hi Liliana, Liliana Marie Prikler writes: > * gnu/packages/version-control.scm (git)[#:phases]: > Also install git-prompt and zsh _git site function. > --- > gnu/packages/version-control.scm | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm > index 9716a6f27a..d8c9bf4009 100644 > --- a/gnu/packages/version-control.scm > +++ b/gnu/packages/version-control.scm > @@ -448,12 +448,17 @@ (define-public git > "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) > (add-after 'install 'install-shell-completion > (lambda* (#:key outputs #:allow-other-keys) > - (let* ((out (assoc-ref outputs "out")) > - (completions (string-append out "/etc/bash_completion.d"))) > - ;; TODO: Install the tcsh and zsh completions in the right place. > - (mkdir-p completions) > + (let* ((out (assoc-ref outputs "out")) > + (bash (string-append out "/etc/bash_completion.d")) > + (zsh (string-append out "/share/zsh/site-functions"))) > + ;; TODO: Install the tcsh completions in the right place. > + (for-each mkdir-p (list bash zsh)) > (copy-file "contrib/completion/git-completion.bash" > - (string-append completions "/git"))))) > + (string-append bash "/git")) > + (copy-file "contrib/completion/git-prompt.sh" > + (string-append out "/bin/git-prompt")) > + (copy-file "contrib/completion/git-completion.zsh" > + (string-append zsh "/_git"))))) > (add-after 'install 'install-credential-netrc > (lambda* (#:key outputs #:allow-other-keys) > (let* ((netrc (assoc-ref outputs "credential-netrc"))) Sorry if my previous reply was not clear, but with your clarifications I think it'd be best to keep the 'contrib' output, perhaps documenting in the description that it contains the 'git-prompt' command as well as completions for Zsh? -- Thanks, Maxim