Merge branch 'release/v4.3.0'v4.3.0

* release/v4.3.0:
  Bump VERSION
  Switch to using GNU Emacs on development machines
  Trim some trailing whitespace
  Clarify control flow in shell scripts
  Add clarifying comment
  Translate a short-circuit into a conditional
  Add a cheeky error message to sd()
  Strip trailing slashes from sd() target
  Correct error message from sd()

1 files changed, 6 insertions, 2 deletions

diff --git a/bin/osc.sh b/bin/osc.sh
index 86923f12..5def12ff 100644
--- a/bin/osc.sh
+++ b/bin/osc.sh
@@ -57,8 +57,12 @@ set -- "$@" -connect "$host":"$serv"
 td='' fil=''
 cleanup() {
     trap - EXIT "$1"
-    [ -n "$fil" ] && kill -TERM "$fil"
-    [ -n "$td" ] && rm -fr -- "$td"
+    if [ -n "$fil" ] ; then
+        kill -TERM "$fil"
+    fi
+    if [ -n "$td" ] ; then
+        rm -fr -- "$td"
+    fi
     if [ "$1" != EXIT ] ; then
         kill -"$1" "$$"
     fi