3 files changed, 7 insertions, 12 deletions
diff --git a/source/ap/vim/doinst.sh b/source/ap/vim/doinst.sh
deleted file mode 100644
index f1ccd5ca3..000000000
--- a/source/ap/vim/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# If there's no vi link, take over:
-if [ ! -r usr/bin/vi ]; then
-  ( cd usr/bin ; ln -sf vim vi )
-fi
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
index 5f15aec02..5bc65fc77 100755
--- a/source/ap/vim/vim-gvim.SlackBuild
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -129,8 +129,6 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Legacy binary links:
-( cd $PKG/usr/bin ; rm -rf ex )
-( cd $PKG/usr/bin ; ln -sf vim ex )
 ( cd $PKG/usr/bin ; rm -rf rview )
 ( cd $PKG/usr/bin ; ln -sf vim rview )
 ( cd $PKG/usr/bin ; rm -rf rvim )
@@ -142,9 +140,11 @@ fi
 ( cd $PKG/usr/bin ; rm -rf evim )
 ( cd $PKG/usr/bin ; ln -sf vim evim )
 
+# These should not be shipped:
+rm -f $PKG/usr/bin/{ex,vi}
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc.vim-gvim > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index 725da7609..1e9cdd0ae 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -185,8 +185,6 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Legacy binary links:
-( cd $PKG/usr/bin ; rm -rf ex )
-( cd $PKG/usr/bin ; ln -sf vim ex )
 ( cd $PKG/usr/bin ; rm -rf rview )
 ( cd $PKG/usr/bin ; ln -sf vim rview )
 ( cd $PKG/usr/bin ; rm -rf rvim )
@@ -198,6 +196,9 @@ fi
 ( cd $PKG/usr/bin ; rm -rf evim )
 ( cd $PKG/usr/bin ; ln -sf vim evim )
 
+# These should not be shipped:
+rm -f $PKG/usr/bin/{ex,vi}
+
 mkdir -p $PKG/usr/doc/vim-$VERSION
 cp -a README.txt $PKG/usr/doc/vim-$VERSION
 find $PKG/usr/doc/vim-$VERSION -type f | xargs chmod 644
@@ -221,7 +222,6 @@ config() {
 }
 config usr/share/vim/vimrc.new
 EOF
-zcat $CWD/doinst.sh.gz >> $PKG/install/doinst.sh
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null