shell/aliases: Replace remaining $* with "$@".

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index e9727dc91361e8cf75fca5cf4da60cdec9090ee3..5f18eb24fea09b0ef5d00e9c6e9a2814887b8520 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -28,7 +28,7 @@ if [ x`id -u` != x0 ]; then
 fi
 # I use some features of screen which are only in Git. Drop them on machines
 # which have older versions. They are marked as "(GIT)".
-if [ $hostname != asp ]; then
+if [ $hostname != asp -o x`id -u` = x0 ]; then
     echo screenrc: removing Git features
     grep -v '(GIT)' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
@@ -69,6 +69,9 @@ if installed colordiff; then
 fi
 link inputrc ~/.inputrc
 link screenrc ~/.screenrc
+if installed tmux; then
+    link tmux.conf ~/.tmux.conf
+fi
 
 # Create rlwrap history directory.
 mkdir -p shell/rlwrap