From bee04c2182f0e05d7de8e904919550804d0ee7c3 Mon Sep 17 00:00:00 2001 From: Aleksandr Proklov Date: Tue, 10 Oct 2023 10:40:02 +0900 Subject: [PATCH] remove double install git-prompt --- 93git-branch.sh | 2 +- git.spec | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/93git-branch.sh b/93git-branch.sh index 8b597b0..ddc7b0d 100644 --- a/93git-branch.sh +++ b/93git-branch.sh @@ -1,6 +1,6 @@ # Include the current git branch in the prompt -. /etc/bash-completion.d/git-prompt +. /usr/share/bash-completion/completions/git-prompt if type __git_ps1 &>/dev/null; then export PS1="$(echo -n "$PS1" | sed "s|\\\W\]|\\\W\$(type __git_ps1 \&>/dev/null \&\& __git_ps1 \" (%s)\")\]|")" fi diff --git a/git.spec b/git.spec index 3fed931..26315e3 100644 --- a/git.spec +++ b/git.spec @@ -8,7 +8,7 @@ Summary: Global Information Tracker Name: git Version: 2.41.0 -Release: 1 +Release: 2 Epoch: 1 License: GPLv2+ Group: Development/Tools @@ -76,7 +76,6 @@ repositories from other VCS. %files -n git-core -f %{name}.lang %doc Documentation/*.html Documentation/howto Documentation/technical Documentation/RelNotes.txt.gz -%config(noreplace) %{_sysconfdir}/bash-completion.d/git-prompt %{_sysconfdir}/emacs/site-start.d/* %{_datadir}/bash-completion/completions/* %{_datadir}/emacs/site-lisp/* @@ -380,13 +379,10 @@ EOF # install bash-completion file mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ -mkdir -p %{buildroot}%{_sysconfdir}/bash-completion.d/ install -m644 contrib/completion/git-completion.bash \ %{buildroot}%{_datadir}/bash-completion/completions/git install -m644 contrib/completion/git-prompt.sh \ %{buildroot}%{_datadir}/bash-completion/completions/git-prompt -install -m644 contrib/completion/git-prompt.sh \ - %{buildroot}%{_sysconfdir}/bash-completion.d/git-prompt # And the prompt manipulation file install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_branch}