[arch-commits] Commit in vim/trunk (PKGBUILD archlinux.vim)

[Levente Polyak]

    Date: Monday, February 26, 2018 @ 22:45:17
  Author: anthraxx
Revision: 317573

upgpkg: vim 8.0.1542-2 (bugfixes, screen-gap, restricted, desktop file)

- FS#57650 FS#57640
  Install swap director`y with system call and silence in case
  its not allowed to invoke (like rvim)
- FS#53431
  Always add desktop files in gvim and add vim only desktop file
  for vim package. This aids mime related applications and has
  a terminal specific setting. Add icons in case its displayed.

Modified:
  vim/trunk/PKGBUILD
  vim/trunk/archlinux.vim

---------------+
 PKGBUILD      |   13 +++++--------
 archlinux.vim |    4 +++-
 2 files changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-26 20:33:18 UTC (rev 317572)
+++ PKGBUILD	2018-02-26 22:45:17 UTC (rev 317573)
@@ -11,7 +11,7 @@
 pkgname=('vim' 'gvim' 'vim-runtime')
 pkgver=8.0.1542
 _versiondir=80
-pkgrel=1
+pkgrel=2
 pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
 url='http://www.vim.org'
 arch=('x86_64')
@@ -24,11 +24,11 @@
         vimdoc.hook)
 sha256sums=('d0818df5c6da23db725aa68067c90c80f0779c2e3446811bd1389b1ac2c2df86'
             'b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b'
-            'cef74d8fd3a22b2af83aeeef4a192ddd624afd0c6df6861db845e6e4f55b32de'
+            '8aa90a9723dc1540546645969a53b67102821775a7c11297dc47e931d469a476'
             '7095cafac21df7aa42749d6864d1c0549fe65771d8edda3102c931c60782b6b9')
 sha512sums=('f6d3af209018ea70c5f87f4b4cc9f8c9daaabd7925ad33a381b20cd744dd7d8e43540f5b0174cd1b01c104a71e3bb6116c585de09c7e5e670a02d93866591541'
             '4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7'
-            '11fd92e385460dff3c0d6ab10ca9284fe47047a9032fba3d285d967c9e87720a04bdfaacfb72e2d7e0054d1f22121b6d60690df0673ca0b4820739f3b0081a2d'
+            'b0a54ef95f955db4a4183ef7643f3c94474009842c791e79903ff97eda8296dacdc3841356c33001fda7054738aa3ddb3fbf680d39b98484cddbceb4618fe98b'
             '1e06e981691b17662fd0fddac5c00c87c920d1b4a1cbb6191c42d57cc40b00af12710e26b22fcfc0901bb8142b15f6a04aa65cec2d9b3bb9d5a06cb650d3ab9c')
 
 prepare() {
@@ -172,8 +172,8 @@
   # Runtime provided by runtime package
   rm -r "${pkgdir}"/usr/share/vim
 
-  # no desktop files and icons
-  rm -r "${pkgdir}"/usr/share/{applications,icons}
+  # remove gvim.desktop as not included
+  rm "${pkgdir}"/usr/share/applications/gvim.desktop
 
   # license
   install -Dm 644 runtime/doc/uganda.txt \
@@ -210,9 +210,6 @@
   # need to remove since this is provided by vim-runtime
   rm -r "${pkgdir}"/usr/share/vim
 
-  # keep gvim desktop file only, remove vim
-  rm "${pkgdir}"/usr/share/applications/vim.desktop
-
   # license
    install -Dm 644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt

Modified: archlinux.vim
===================================================================
--- archlinux.vim	2018-02-26 20:33:18 UTC (rev 317572)
+++ archlinux.vim	2018-02-26 22:45:17 UTC (rev 317573)
@@ -17,7 +17,9 @@
 set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc,.png,.jpg
 
 " Move the swap file location to protect against CVE-2017-1000382
-silent !install -d -m 700 ~/.vim/swap/ 2>&1 > /dev/null
+if ! isdirectory('~/.vim/swap/')
+  silent! call system('install -dm 700 ~/.vim/swap')
+endif
 set directory=~/.vim/swap/
 
 if has('gui_running')