From: Simon Ruderich Date: Mon, 15 Oct 2012 19:53:11 +0000 (+0200) Subject: xinitrc: Use test instead of [ and $HOME instead of ~. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=f08deb1fc626e530287bc140cc6ee9e5c2882d75;p=config%2Fdotfiles.git xinitrc: Use test instead of [ and $HOME instead of ~. Is a bit more portable and more consistent. --- diff --git a/xinitrc b/xinitrc index 3688145..201e636 100755 --- a/xinitrc +++ b/xinitrc @@ -20,7 +20,7 @@ # Start ssh-agent if we have private keys, thanks to # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). -if [ -x /usr/bin/ssh-agent -a -f "$HOME/.ssh/id_rsa" ]; then +if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then # -s to force bourne shell output. This file is a bourne shell script even # if the environment might suggest otherwise. eval `/usr/bin/ssh-agent -s` @@ -30,29 +30,29 @@ fi xsetroot -solid black # Force English keyboard layout. -if [ -x /usr/bin/setxkbmap ]; then +if test -x /usr/bin/setxkbmap; then setxkbmap us fi # Use my X11 key bindings. -xmodmap ~/.xmodmaprc +xmodmap "$HOME/.xmodmaprc" # Change the background if available. -if [ -f ~/.background ]; then +if test -f "$HOME/.background"; then # But not on slow machines in the university. HOSTNAME=`hostname` - if [ "x`echo $HOSTNAME | grep faui0sr`" = x ]; then - if [ -x /usr/bin/hsetroot ]; then - hsetroot -full ~/.background - elif [ -x /usr/bin/feh ]; then - feh --bg-scale ~/.background + if test "x`echo $HOSTNAME | grep faui0sr`" = x; then + if test -x /usr/bin/hsetroot; then + hsetroot -full "$HOME/.background" + elif test -x /usr/bin/feh; then + feh --bg-scale "$HOME/.background" fi fi fi # Display timed reminders and recheck the file for changes every minute (-z1). -if [ -x /usr/bin/remind -a -f ~/.reminders ]; then - remind -z1 -k'.shell/bin/notify.py %s &' ~/.reminders & +if test -x /usr/bin/remind && test -f "$HOME/.reminders"; then + remind -z1 -k'.shell/bin/notify.py %s &' "$HOME/.reminders" & fi # Start XMonad.