Djam/git
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/git.git synced 2025-02-23 09:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove double install git-prompt

Browse source
This commit is contained in:
Aleksandr Proklov 2023-10-10 10:40:02 +09:00
parent 7ca2d2a9b6
commit bee04c2182
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
93git-branch.sh
View file

@ -1,6 +1,6 @@
# Include the current git branch in the prompt # 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 if type __git_ps1 &>/dev/null; then
export PS1="$(echo -n "$PS1" | sed "s|\\\W\]|\\\W\$(type __git_ps1 \&>/dev/null \&\& __git_ps1 \" (%s)\")\]|")" export PS1="$(echo -n "$PS1" | sed "s|\\\W\]|\\\W\$(type __git_ps1 \&>/dev/null \&\& __git_ps1 \" (%s)\")\]|")"
fi fi

6
git.spec
View file

@ -8,7 +8,7 @@
Summary: Global Information Tracker Summary: Global Information Tracker
Name: git Name: git
Version: 2.41.0 Version: 2.41.0
Release: 1 Release: 2
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: Development/Tools Group: Development/Tools
@ -76,7 +76,6 @@ repositories from other VCS.
%files -n git-core -f %{name}.lang %files -n git-core -f %{name}.lang
%doc Documentation/*.html Documentation/howto Documentation/technical Documentation/RelNotes.txt.gz %doc Documentation/*.html Documentation/howto Documentation/technical Documentation/RelNotes.txt.gz
%config(noreplace) %{_sysconfdir}/bash-completion.d/git-prompt
%{_sysconfdir}/emacs/site-start.d/* %{_sysconfdir}/emacs/site-start.d/*
%{_datadir}/bash-completion/completions/* %{_datadir}/bash-completion/completions/*
%{_datadir}/emacs/site-lisp/* %{_datadir}/emacs/site-lisp/*
@ -380,13 +379,10 @@ EOF
# install bash-completion file # install bash-completion file
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
mkdir -p %{buildroot}%{_sysconfdir}/bash-completion.d/
install -m644 contrib/completion/git-completion.bash \ install -m644 contrib/completion/git-completion.bash \
%{buildroot}%{_datadir}/bash-completion/completions/git %{buildroot}%{_datadir}/bash-completion/completions/git
install -m644 contrib/completion/git-prompt.sh \ install -m644 contrib/completion/git-prompt.sh \
%{buildroot}%{_datadir}/bash-completion/completions/git-prompt %{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 # And the prompt manipulation file
install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_branch} install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_branch}