From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1623669-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09F621581E7 for <garchives@archives.gentoo.org>; Mon, 22 Apr 2024 14:41:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AD3DE29C4; Mon, 22 Apr 2024 14:41:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C22EE29C4 for <gentoo-commits@lists.gentoo.org>; Mon, 22 Apr 2024 14:41:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39199343401 for <gentoo-commits@lists.gentoo.org>; Mon, 22 Apr 2024 14:41:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A36F1671 for <gentoo-commits@lists.gentoo.org>; Mon, 22 Apr 2024 14:41:03 +0000 (UTC) From: "Ionen Wolkens" <ionen@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org> Message-ID: <1713796827.24b7f18223f59a0f75126f353b438b55594a8fc7.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-shell-integration/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1-r1.ebuild x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1.ebuild x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild X-VCS-Directories: x11-terms/kitty-shell-integration/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 24b7f18223f59a0f75126f353b438b55594a8fc7 X-VCS-Branch: master Date: Mon, 22 Apr 2024 14:41:03 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5cba1b39-278d-443d-8d8b-f5f45d0fa3fb X-Archives-Hash: 62baaff42dfc890729e4d0dc74819e95 commit: 24b7f18223f59a0f75126f353b438b55594a8fc7 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Apr 22 14:28:36 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Apr 22 14:40:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b7f182 x11-terms/kitty-shell-integration: prefix kitty.bash with 90- Fits better with the new 10-gentoo-*.bash files. kitty's modifies PS1 so it needs to come after PS1 has been determined which is no longer done by the bashrc itself, so give it a high number. Thankfully "kitty.bash" still sorts after 10-gentoo-color.bash (which overwrites PS1) so bash's files changes did not break anything. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> ...gration-0.34.1.ebuild => kitty-shell-integration-0.34.1-r1.ebuild} | 2 +- x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1-r1.ebuild similarity index 94% rename from x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1.ebuild rename to x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1-r1.ebuild index c3b309c79626..a50a1338ca92 100644 --- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1.ebuild +++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1-r1.ebuild @@ -23,7 +23,7 @@ src_install() { insinto /usr/share/kitty doins -r shell-integration - dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash + dosym -r {/usr/share/kitty/shell-integration/bash/,/etc/bash/bashrc.d/90-}kitty.bash dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild index f6d49ccbd8a8..5e6174ae77d5 100644 --- a/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild +++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ src_install() { insinto /usr/share/kitty doins -r shell-integration - dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash + dosym -r {/usr/share/kitty/shell-integration/bash/,/etc/bash/bashrc.d/90-}kitty.bash dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish