From c3d4f097a7282f81d4c0efc702efdb6e99cb218c Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 9 Mar 2017 10:03:33 +1300
Subject: Use env vars not shell funcs for vim check

Set EDITOR and VISUAL appropriately based on what's on the system.

We can't assume ed(1) unfortunately, but ex(1) should be there.
---
 sh/profile.d/editor.sh |  8 ++++++--
 sh/profile.d/visual.sh |  8 ++++++--
 sh/shrc.d/vim.sh       | 13 -------------
 3 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 sh/shrc.d/vim.sh

(limited to 'sh')

diff --git a/sh/profile.d/editor.sh b/sh/profile.d/editor.sh
index ee0da70b..5d6b249e 100644
--- a/sh/profile.d/editor.sh
+++ b/sh/profile.d/editor.sh
@@ -1,3 +1,7 @@
-# Set command-line editor
-EDITOR=ed
+# Set command-line editor; ed if we've got it (!), but ex will do fine
+if command -v ed >/dev/null 2>&1 ; then
+    EDITOR=ed
+else
+    EDITOR=ex
+fi
 export EDITOR
diff --git a/sh/profile.d/visual.sh b/sh/profile.d/visual.sh
index 95eb1d5d..d03da255 100644
--- a/sh/profile.d/visual.sh
+++ b/sh/profile.d/visual.sh
@@ -1,3 +1,7 @@
-# Set visual editor
-VISUAL=vi
+# Set visual editor; vim if we've got it, but vi will do fine
+if command -v vim >/dev/null 2>&1 ; then
+    VISUAL=vim
+else
+    VISUAL=vi
+fi
 export VISUAL
diff --git a/sh/shrc.d/vim.sh b/sh/shrc.d/vim.sh
deleted file mode 100644
index e9174082..00000000
--- a/sh/shrc.d/vim.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# If Vim exists on the system, use it instead of ex, vi, and view
-command -v vim >/dev/null 2>&1 || return
-
-# Define functions proper
-ex() {
-    vim -e "$@"
-}
-vi() {
-    vim "$@"
-}
-view() {
-    vim -R "$@"
-}
-- 
cgit v1.2.3