From 89f185d62638c682fc363d4747d8cef9c7f39fd5 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 24 Mar 2017 11:10:10 +1300
Subject: Remove double-up colon check in path()

---
 sh/shrc.d/path.sh | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'sh')

diff --git a/sh/shrc.d/path.sh b/sh/shrc.d/path.sh
index 2759e11f..79b48fd5 100644
--- a/sh/shrc.d/path.sh
+++ b/sh/shrc.d/path.sh
@@ -1,14 +1,6 @@
 # Function to manage contents of PATH variable within the current shell
 path() {
 
-    # The second argument, the directory, can never have a colon
-    case $2 in
-        *:*)
-            printf >&2 'path(): %s illegal colon\n' "$2"
-            return 2
-            ;;
-    esac
-
     # Check first argument to figure out operation
     case $1 in
 
-- 
cgit v1.2.3


From 2e28d5a885608fddd1e0b7464ba3c9582a9e8ca4 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 24 Mar 2017 14:02:59 +1300
Subject: Add exm(1df) to work around Vim's screen-clearing

---
 sh/profile.d/editor.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'sh')

diff --git a/sh/profile.d/editor.sh b/sh/profile.d/editor.sh
index 5d6b249e..307879fe 100644
--- a/sh/profile.d/editor.sh
+++ b/sh/profile.d/editor.sh
@@ -1,7 +1,16 @@
-# Set command-line editor; ed if we've got it (!), but ex will do fine
+# Ideally, we'd use plain old ed(1), but many Linux distributions don't install
+# it by default
 if command -v ed >/dev/null 2>&1 ; then
     EDITOR=ed
+
+# Failing that, if we have both vim(1) and exm(1df) in our $PATH, use the
+# latter to work around Vim's ex mode screen-clearing
+elif { command -v vim && command -v exm ; } >/dev/null 2>&1 ; then
+    EDITOR=exm
+
+# Otherwise, just call ex(1) directly
 else
     EDITOR=ex
 fi
+
 export EDITOR
-- 
cgit v1.2.3