From patchwork Sat Sep 23 19:43:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 54376 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 8E24E27BBEA; Thu, 28 Sep 2023 19:54:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 ECE7B27BBE2 for ; Thu, 28 Sep 2023 19:54:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlw90-0003hX-3m; Thu, 28 Sep 2023 14:53:50 -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 1qlw8y-0003hN-Ti for guix-patches@gnu.org; Thu, 28 Sep 2023 14:53:48 -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 1qlw8y-0002G6-DX for guix-patches@gnu.org; Thu, 28 Sep 2023 14:53:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlw9C-0007a4-6t for guix-patches@gnu.org; Thu, 28 Sep 2023 14:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66171] [PATCH v3] gnu: git: Install zsh completions and git-prompt. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Sep 2023 18:54:02 +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: 66171@debbugs.gnu.org Cc: Efraim Flashner , Maxim Cournoyer , Simon Tournier Received: via spool by 66171-submit@debbugs.gnu.org id=B66171.169592721429097 (code B ref 66171); Thu, 28 Sep 2023 18:54:02 +0000 Received: (at 66171) by debbugs.gnu.org; 28 Sep 2023 18:53:34 +0000 Received: from localhost ([127.0.0.1]:54501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlw8k-0007ZF-3D for submit@debbugs.gnu.org; Thu, 28 Sep 2023 14:53:34 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:61789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlw8g-0007Yv-9t for 66171@debbugs.gnu.org; Thu, 28 Sep 2023 14:53:32 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-5363227cc80so1414627a12.3 for <66171@debbugs.gnu.org>; Thu, 28 Sep 2023 11:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695927190; x=1696531990; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=xRmPsG7Tm/6N2LZvxMmofgaI07StOCgvmpkG2VSTVgw=; b=CGVqa+IzT7Fk+7uNbEPDOP8tz8bm2RVPQSCXkmmNiyOyWN/bAto+9TQuErzZLoG4bz nRCDlNdQvpqS3fmZFzJqtrMn/XbaS5eKRu/z5rFR6BM9LZqoLy9NEnPwE8Kh55U++v2U ytLYIgf8bAXOxxoRRlQHfES5tg1YFfHbx/6pEtlgZCgkVSI/XP4ULv0YPBO1cbKaJAqd V7LcNsLMXvff2vqZDIxxuT3rJJKFskzNDBE+398ZMki34Vt/+AUeEd7On2obBQfh3iV1 hOyN+0sQDq4RhDZYAnQhanzUUDJHyG1w/ID72GVso3t2v6aUaHWtY4rNwM8UBodXBTvl wxzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695927190; x=1696531990; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=xRmPsG7Tm/6N2LZvxMmofgaI07StOCgvmpkG2VSTVgw=; b=TPKIEafBP7fZ2VgNq0hg6sXkMYGrldpxgzTjsGOgIDXJWjoAaSUtRLJ9jSXUDI6hGW rEvL7vBlsGzsT/gGIR1RuYXDkHEm+fOD1NgNLedz399kyQ6LFU6OXoESvaXHKUcq5wWx DH18Zjqa3xfzU81fNtX7nyZykh4qzCW6LW6pD9c/p2tbm26BKE6gqXAkzJMKRT4pbjFq lvUeHaTzBZIP1msgVG7lcgBj8loAYoibR+aggRLsCWDUyxI4WhuYdaD0xn9Ek9ROj2Se 7OL7CYctb+b0vBC5EcY8zcJhVFF3x5fRxnJEO39WDWCeFWxnDDgoTVOxmrvAll7oQYQU Ns4w== X-Gm-Message-State: AOJu0YwCK9CXmXwcS3eL09T25Vnce3Xr6V+OC0WFfaOwihzR3/f6ckdN 9Ga+nGI0DlD54Xed5PHSGtFk8n2QzWuAOw== X-Google-Smtp-Source: AGHT+IEpolu9H4hJLMiVwzAC17he8QIB7Q0fZq0/KsAsODMzMOykMcM83sY2vN3hFfaf+DYrWEAdkQ== X-Received: by 2002:a05:6402:8d8:b0:523:100b:462b with SMTP id d24-20020a05640208d800b00523100b462bmr2243050edz.5.1695927189696; Thu, 28 Sep 2023 11:53:09 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id eg42-20020a05640228aa00b00533dad8a9c5sm6949654edb.38.2023.09.28.11.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 11:53:08 -0700 (PDT) Message-ID: <00b2291bb7eaa66b3f62ea4d94e44bf85ec62b51.1695927171.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 23 Sep 2023 21:43:07 +0200 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 * 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(-) base-commit: ce0cc6137df81919389f61671096a6ce701c0889 prerequisite-patch-id: ee5d7299c5790d77e0d409f34165063fcff10a8b prerequisite-patch-id: 369548fa905a48e7e2164ca4b6c9897e392a5025 prerequisite-patch-id: 7650e691c505ecc63e3b1a1265b3cb3a2869443e prerequisite-patch-id: 5e7e47f338fa42c4f5c654a803f062b5e3f757a6 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")))