Skip to content
This repository has been archived by the owner on May 26, 2023. It is now read-only.

Commit

Permalink
app-editors/vim-core: skip installing defaults.vim when installed
Browse files Browse the repository at this point in the history 
Do not install defaults.vim when the file is already installed
from vim. This is needed for avoiding installation conflicts between
vim and vim-core.

Closes: https://bugs.gentoo.org/830177
Signed-off-by: Dongsu Park <dpark@linux.microsoft.com>
Closes: gentoo#23986
Signed-off-by: Sam James <sam@gentoo.org>
  • Loading branch information
@dongsupark @thesamesam
dongsupark authored and thesamesam committed Feb 18, 2022
1 parent 49adc5f commit e4c6279
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 24 deletions.
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.0814.ebuild
View file
Expand Up @@ -191,9 +191,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -208,6 +205,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3428.ebuild
View file
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3567.ebuild
View file
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3582.ebuild
View file
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3669.ebuild
View file
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3741.ebuild
View file
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3950.ebuild
View file
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-9999.ebuild
View file
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down

0 comments on commit e4c6279

Please sign in to comment.