Support bashrc_d_on_exit()

Author: robinbb

bash_login

@@ -1,2 +1,2 @@
-# Do not put anything in this file; Bash will not read it. Bash would only
-# read it if ~/.bash_profile did not exist.
+# STOP! Do not put anything in this file; Bash will not read it. Bash would
+# only read it if ~/.bash_profile did not exist.

bash_logout

@@ -1,16 +1,2 @@
-#  Copyright 2015 Robin Bate Boerop <[email protected]>
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-# STOP! Do not put code here. It will not do what you think it will.
-# Instead, please add code to the exit_trap() function in the bashrc file.
+# STOP! Do not put code here. It will not do what you think.  Instead, please
+# use bashrc_d_on_exit() to register a Bash command to be eval'd on exit.

bash_profile

@@ -19,6 +19,18 @@
 export BASHRC_D_BASH_PROFILE_SOURCED=1
 export BASHRC_D_DIR=~/.bashrc.d
 
+bashrc_d_on_exit_commands=()
+bashrc_d_invoke_on_exit_commands() {
+   local i
+   for i in ${bashrc_d_exit_commands[*]}; do
+      eval $i
+   done
+}
+bashrc_d_on_exit() {
+   bashrc_d_on_exit_commands+=("$*")
+   trap bashrc_d_invoke_on_exit_commands EXIT
+}
+   
 # Bash utility functions upon which the custom scripts can rely, but which
 # can be overridden if desired.
 #