From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 20 Nov 2011 01:39:41 +0000 (+0100)
Subject: Merge remote branch 'asp/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=bcf9899edea870018ffc19ab8f659ae98b0f6f85;hp=fe1eb400053afc56eba1acc7320f5eeabe3a7681;p=config%2Fdotfiles.git

Merge remote branch 'asp/master'
---

diff --git a/csh/rc b/csh/rc
index f2f01a7..543b053 100644
--- a/csh/rc
+++ b/csh/rc
@@ -1,9 +1,10 @@
 # Csh configuration file.
 
 
-# Start Zsh in interactive mode, otherwise do nothing.
+# Start Zsh in interactive login mode, otherwise do nothing. -l is used so Zsh
+# sources .zlogin and .zlogout.
 if ($?prompt) then
-    exec zsh
+    exec zsh -l
 endif
 
 # vim: ft=csh
diff --git a/shell/aliases b/shell/aliases
index 52e105c..f59801b 100644
--- a/shell/aliases
+++ b/shell/aliases
@@ -62,15 +62,15 @@ fi
 unset ls_color
 # Helper function to list all files.
 la() {
-    ls -a $*
+    ls -a "$@"
 }
 # Helper function to list the files in list format with access rights, etc.
 ll() {
-    ls -l $*
+    ls -l "$@"
 }
 # Helper function to list all files in list format with access rights, etc.
 lal() {
-    la -l $*
+    la -l "$@"
 }
 
 
diff --git a/shell/logout b/shell/logout
index 10affa1..491f594 100644
--- a/shell/logout
+++ b/shell/logout
@@ -3,12 +3,11 @@
 
 # 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 [ -x /usr/bin/clear_console ]; then
+    /usr/bin/clear_console -q
+else
+    clear
 fi
 
 # Make sure sudo rights are removed.