summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2016-06-12 23:42:44 -0500
committerDoug Newgard2016-06-12 23:42:44 -0500
commit598a87ed36968588ee8c7451ee05beb443096ef7 (patch)
treede28c45f8e525ffb396d12e42ad56d8f2c92bd02
parentc908b55a889d767d9c26428deef97bbe30491d8a (diff)
downloadaur-598a87ed36968588ee8c7451ee05beb443096ef7.tar.gz
Adapt to my preferred style
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD33
-rwxr-xr-xvimdiff2
3 files changed, 18 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f652a15988fa..58f7e0823c5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
pkgbase = neovim-symlinks
- pkgdesc = System-wide: Runs neovim if vi or vim is invoked.
- pkgver = 1.0.1
- pkgrel = 3
+ pkgdesc = Runs neovim if vi or vim is called
+ pkgver = 2
+ pkgrel = 1
arch = any
- license = MIT
depends = neovim
+ depends = sh
provides = vim
provides = vi
conflicts = vim
conflicts = vi
conflicts = vi-vim-symlink
- source = vimdiff
- md5sums = 8ca45b6b93e6dab571f542ef262093e4
pkgname = neovim-symlinks
diff --git a/PKGBUILD b/PKGBUILD
index cb8358dca330..8d5791dfd3bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,24 @@
-# Maintainer: Tomas Storck <storcktomas@gmail.com>
+# Maintainer: Doug Newgard <scimmia at archlinux dot info>
+# Contributor: Tomas Storck <storcktomas@gmail.com>
# Contributor: Tom Richards <tom@tomrichards.net>
+
pkgname=neovim-symlinks
-pkgver=1.0.1
-pkgrel=3
-pkgdesc="System-wide: Runs neovim if vi or vim is invoked."
+pkgver=2
+pkgrel=1
+pkgdesc='Runs neovim if vi or vim is called'
arch=('any')
-license=('MIT')
-depends=('neovim')
+depends=('neovim' 'sh')
provides=('vim' 'vi')
conflicts=('vim' 'vi' 'vi-vim-symlink')
-source=('vimdiff')
-md5sums=('8ca45b6b93e6dab571f542ef262093e4')
-sha256sums=()
package() {
- install -dm755 "$pkgdir/usr/bin"
+ install -dm755 "$pkgdir/usr/bin/"
- # vim --> nvim
- _link_names=(edit ex rview rvim vedit vi view vim)
- for _link in "${_link_names[@]}";
- do
- ln -s nvim "$pkgdir/usr/bin/$_link"
- done
+ for _link in edit ex rview rvim vedit vi view vim; do
+ ln -s nvim "$pkgdir/usr/bin/$_link"
+ done
- # vimdiff --> nvim -d
- install -Dm755 "$srcdir/vimdiff" "$pkgdir/usr/bin/vimdiff"
+ # vimdiff --> nvim -d
+ echo -e '#!/bin/sh\nexec vim -d "$@"' > "$pkgdir/usr/bin/vimdiff"
+ chmod 755 "$pkgdir/usr/bin/vimdiff"
}
-
diff --git a/vimdiff b/vimdiff
deleted file mode 100755
index 5f69f228a5da..000000000000
--- a/vimdiff
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vim -d "$@"