Use more wrapper scripts to run what's actually called

2 files changed, 11 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58f7e0823c5c..54ce3a3f0a33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = neovim-symlinks
 	pkgdesc = Runs neovim if vi or vim is called
-	pkgver = 2
+	pkgver = 3
 	pkgrel = 1
 	arch = any
 	depends = neovim
diff --git a/PKGBUILD b/PKGBUILD
index 8d5791dfd3bd..36ef836c61cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tom Richards <tom@tomrichards.net>
 
 pkgname=neovim-symlinks
-pkgver=2
+pkgver=3
 pkgrel=1
 pkgdesc='Runs neovim if vi or vim is called'
 arch=('any')
@@ -14,11 +14,15 @@ conflicts=('vim' 'vi' 'vi-vim-symlink')
 package() {
   install -dm755 "$pkgdir/usr/bin/"
 
-  for _link in edit ex rview rvim vedit vi view vim; do
+  echo -e '#!/bin/sh\nexec nvim -e "$@"'  > "$pkgdir/usr/bin/ex"
+  echo -e '#!/bin/sh\nexec nvim -E "$@"'  > "$pkgdir/usr/bin/exim"
+  echo -e '#!/bin/sh\nexec nvim -RZ "$@"' > "$pkgdir/usr/bin/rview"
+  echo -e '#!/bin/sh\nexec nvim -Z "$@"'  > "$pkgdir/usr/bin/rvim"
+  echo -e '#!/bin/sh\nexec nvim -R "$@"'  > "$pkgdir/usr/bin/view"
+  echo -e '#!/bin/sh\nexec nvim -d "$@"'  > "$pkgdir/usr/bin/vimdiff"
+  chmod 755 "$pkgdir/usr/bin/"*
+
+  for _link in edit vedit vi vim; do
     ln -s nvim "$pkgdir/usr/bin/$_link"
   done
-
-  # vimdiff --> nvim -d
-  echo -e '#!/bin/sh\nexec vim -d "$@"' > "$pkgdir/usr/bin/vimdiff"
-  chmod 755 "$pkgdir/usr/bin/vimdiff"
 }