From 88e4b992d90f2a7283058a1a93c388a9576bad5b Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 19 Aug 2016 23:58:25 +1200
Subject: Move OLDPWD setting to POSIX sh dir

With an attempt at correct trapping; may still require tweaking
---
 Makefile         |  1 +
 bash/bash_logout |  3 ---
 sh/logout        |  2 ++
 sh/profile       | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 sh/logout

diff --git a/Makefile b/Makefile
index 5d8369c9..433a9f43 100644
--- a/Makefile
+++ b/Makefile
@@ -267,6 +267,7 @@ install-sh : check-sh
 	install -m 0755 -d -- \
 		"$(HOME)"/.profile.d \
 		"$(HOME)"/.shrc.d
+	install -pm 0644 -- sh/logout "$(HOME)"/.logout
 	install -pm 0644 -- sh/profile "$(HOME)"/.profile
 	install -pm 0644 -- sh/profile.d/* "$(HOME)"/.profile.d
 	install -pm 0644 -- sh/shrc "$(HOME)"/.shrc
diff --git a/bash/bash_logout b/bash/bash_logout
index e8137e55..afb088b8 100644
--- a/bash/bash_logout
+++ b/bash/bash_logout
@@ -12,6 +12,3 @@ fi
 if ((SHLVL == 1)) ; then
     clear_console -q 2>/dev/null
 fi
-
-# Write PWD to a file if set
-printf '%s\n' "$PWD" > "${OLDPWD_FILE:-$HOME/.oldpwd}"
diff --git a/sh/logout b/sh/logout
new file mode 100644
index 00000000..4da61192
--- /dev/null
+++ b/sh/logout
@@ -0,0 +1,2 @@
+# Write PWD to a file if set
+printf '%s\n' "$PWD" >"${OLDPWD_FILE:-"$HOME"/.oldpwd}"
diff --git a/sh/profile b/sh/profile
index 5dfe0ef3..7fea250b 100644
--- a/sh/profile
+++ b/sh/profile
@@ -9,6 +9,21 @@ for sh in "$HOME"/.profile.d/*.sh ; do
 done
 unset -v sh
 
+# Trap on exit to run ~/.logout if it exists
+logout_trap() {
+    if [ -f "$HOME"/.logout ] ; then
+        . "$HOME"/.logout
+    fi
+    if [ "$1" != EXIT ] ; then
+        trap - "$1"
+        kill "-$1" "$$"
+    fi
+}
+for sig in EXIT HUP INT TERM ; do
+    trap "logout_trap $sig" "$sig"
+done
+unset -v sig
+
 # If ENV is unset after running those scripts and ~/.shrc exists, set it as ENV
 if [ -z "$ENV" ] && [ -f "$HOME"/.shrc ] ; then
     ENV=$HOME/.shrc
-- 
cgit v1.2.3