From: Simon Ruderich Date: Mon, 25 Mar 2013 14:30:52 +0000 (+0100) Subject: xinitrc: Search PATH when checking for binaries. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=56e003e31c1fef9bcdbfda9a47226fd22ec0cf1e;p=config%2Fdotfiles.git xinitrc: Search PATH when checking for binaries. Don't require them to be located in /usr/bin/. `which` is not portable, therfore use `type`! --- diff --git a/xinitrc b/xinitrc index c1a96fb..58d401f 100755 --- a/xinitrc +++ b/xinitrc @@ -27,6 +27,11 @@ LANG=en_US.UTF-8 export LANG +installed() { + type "$1" >/dev/null 2>&1 +} + + # Start ssh-agent if we have private keys, thanks to # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then @@ -39,7 +44,7 @@ fi xsetroot -solid black # Force English keyboard layout. -if test -x /usr/bin/setxkbmap; then +if installed setxkbmap; then setxkbmap us fi @@ -56,9 +61,9 @@ fi # Change the background if available. if test -f "$HOME/.background" && test -n "$set_background"; then - if test -x /usr/bin/hsetroot; then + if installed hsetroot; then hsetroot -full "$HOME/.background" - elif test -x /usr/bin/feh; then + elif installed feh; then feh --bg-scale "$HOME/.background" # Remove the unnecessary ~/.fehbg file created by `feh`. I don't want # to restore the background, I just run `feh` on each startx run. @@ -68,7 +73,7 @@ if test -f "$HOME/.background" && test -n "$set_background"; then fi # Display timed reminders and recheck the file for changes every minute (-z1). -if test -x /usr/bin/remind && test -f "$HOME/.reminders"; then +if installed remind && test -f "$HOME/.reminders"; then remind -z1 -k'.shell/bin/notify.py %s &' "$HOME/.reminders" & fi