Merge remote branch 'asp/master'

diff --git a/csh/rc b/csh/rc
index f2f01a7ce3b0a9dfd66d8fc3fd5ce63aa3a6eb80..543b053c674e65029d13ab095278e292e5643f11 100644 (file)
--- 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 52e105c645008fd452d8ba074f40dce3f9e320e6..f59801bba4c13b650c7f8e91eb50961bc69552fb 100644 (file)
--- 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 10affa145cea962c1e672fa15f52c6321ca2e5c8..491f594a589bd3eaa263803d5f96662aec31c33f 100644 (file)
--- 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.