Skip to contentSkip to conversation

vim: be more careful when removing the documentation

PATCH Superseded Thomas Petazzoni 2 participants 3 messages Dec 5, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 vim: be more careful when removing the documentation

The current VIM_REMOVE_DOCS hook removes all .txt files from /usr/share/vim. Unfortunately, this also removes the rgb.txt file, which is needed at runtime for vim, as reported in bug #9466.

This commit changes VIM_REMOVE_DOCS to remove only /usr/share/vim/vim80/doc/. Size-wise, it's equivalent because:

- We are no longer removing a few README.txt in other directories, taking more space.

- We are now removing the /usr/share/vim/vim*/doc/ folder entirely, which contained a few files not named *.txt

So overall, the size of /usr/share/vim/ before and after this patch is still 11MB.

Fixes bug #9466.

---
Changes since v1:

- Remove /usr/share/vim/vim*/doc/ instead of /usr/share/vim/vim80/doc/ in order to make the code compatible with upcoming bumps to the vim version. Suggested by Mateusz Furdyna.

---
 package/vim/vim.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/vim/vim.mk +1 -1
index d4a1f82..308855e 100644
@@ -61,7 +61,7 @@ define VIM_INSTALL_RUNTIME_CMDS
 endef
 
 define VIM_REMOVE_DOCS
-	find $(TARGET_DIR)/usr/share/vim -type f -name "*.txt" -delete
+	$(RM) -rf $(TARGET_DIR)/usr/share/vim/vim*/doc/
 endef
 
 # Avoid oopses with vipw/vigr, lack of $EDITOR and 'vi' command expectation
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/1 vim: be more careful when removing the documentation

Quoted 9 lines · Thomas Petazzoni

The current VIM_REMOVE_DOCS hook removes all .txt files from /usr/share/vim. Unfortunately, this also removes the rgb.txt file, which is needed at runtime for vim, as reported in bug #9466.

This commit changes VIM_REMOVE_DOCS to remove only /usr/share/vim/vim80/doc/. Size-wise, it's equivalent because:

- We are no longer removing a few README.txt in other directories, taking more space.

To keep things the same, we *could* still find README*.txt (instead of *.txt)
in addition to removing the doc directory. But that just makes 32K difference (over 11MB) so not really worth it. So

Regards,
Arnout

Quoted 34 lines

- We are now removing the /usr/share/vim/vim*/doc/ folder entirely, which contained a few files not named *.txt

So overall, the size of /usr/share/vim/ before and after this patch is still 11MB.

Fixes bug #9466.

---
Changes since v1:

- Remove /usr/share/vim/vim*/doc/ instead of /usr/share/vim/vim80/doc/ in order to make the code compatible with upcoming bumps to the vim version. Suggested by Mateusz Furdyna.

---
 package/vim/vim.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/vim/vim.mk +1 -1
index d4a1f82..308855e 100644
@@ -61,7 +61,7 @@ define VIM_INSTALL_RUNTIME_CMDS
 endef
 
 define VIM_REMOVE_DOCS
-	find $(TARGET_DIR)/usr/share/vim -type f -name "*.txt" -delete
+	$(RM) -rf $(TARGET_DIR)/usr/share/vim/vim*/doc/
 endef
 
 # Avoid oopses with vipw/vigr, lack of $EDITOR and 'vi' command expectation
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
author Applied
#2 lore raw

PATCH v2 1/1 vim: be more careful when removing the documentation

In reply to Thomas Petazzoni

Hello,

Quoted 16 lines · Thomas Petazzoni

The current VIM_REMOVE_DOCS hook removes all .txt files from /usr/share/vim. Unfortunately, this also removes the rgb.txt file, which is needed at runtime for vim, as reported in bug #9466.

This commit changes VIM_REMOVE_DOCS to remove only /usr/share/vim/vim80/doc/. Size-wise, it's equivalent because:

- We are no longer removing a few README.txt in other directories, taking more space.

- We are now removing the /usr/share/vim/vim*/doc/ folder entirely, which contained a few files not named *.txt

So overall, the size of /usr/share/vim/ before and after this patch is still 11MB.

Quoted 6 lines

Fixes bug #9466.

---
Changes since v1:

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com