shell/rc: Rename timeout_setup_shell_lock() to _logout().

[config/dotfiles.git] / shell / logout

diff --git a/shell/logout b/shell/logout
index 1a87b04be282ba842d60e5ed5a0b42f362a13117..a5e1bbc9c0368cc76825337d82a1476bff383663 100644 (file)
--- a/shell/logout
+++ b/shell/logout
@@ -1,14 +1,31 @@
 # Shell logout file usable by all shells.
 
+# Copyright (C) 2011-2013  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # When leaving the console clear the screen to increase privacy. Taken from
 # Debian default bash files and modified. Thanks.
-if [ "$SHLVL" = 1 ]; then
-    if [ -x /usr/bin/clear_console ]; then
-        /usr/bin/clear_console -q
-    else
-        clear
-    fi
+
+if test -x /usr/bin/clear_console; then
+    /usr/bin/clear_console -q
+else
+    clear
 fi
 
+# Make sure sudo rights are removed.
+sudo -k >/dev/null 2>&1
+
 # vim: ft=sh