From: Simon Ruderich Date: Mon, 9 Jun 2014 12:41:19 +0000 (+0200) Subject: shell/aliases: use `command` X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=b2a118a0ad79bcee7bd83925ac9df338d6087f2f;p=config%2Fdotfiles.git shell/aliases: use `command` No need to store the absolute path to the binary. --- diff --git a/setup.sh b/setup.sh index e40249a..08efb21 100755 --- a/setup.sh +++ b/setup.sh @@ -82,8 +82,6 @@ fi # shell/aliases.in for details. Doing this here instead of in shell/aliases # speeds up shell starts. # -# Absolute path to `ls`. -ls_path=`installed_path ls` # GNU ls with colors available. if ls --color >/dev/null 2>&1; then ls_env= @@ -106,8 +104,8 @@ else fi generate shell/aliases .in simple_cpp \ - LS_ENV LS_PATH LS_COLOR COLUMN -- \ - "$ls_env" "$ls_path" "$ls_color" "$column" + LS_ENV LS_COLOR COLUMN -- \ + "$ls_env" "$ls_color" "$column" # If `tig` is not available use my simple replacement. if ! installed tig; then diff --git a/shell/aliases.in b/shell/aliases.in index d60bd52..02958da 100644 --- a/shell/aliases.in +++ b/shell/aliases.in @@ -52,10 +52,10 @@ unalias ls 2>/dev/null # normal ls which needs CLICOLOR_FORCE so it displays colors when used with a # pager. If none work no colors are used. # -# See `setup.sh` for details. LS_ENV, LS_PATH, LS_COLOR are replaced with the +# See `setup.sh` for details. LS_ENV and LS_COLOR are replaced with the # correct values when this file is generated. ls() { - LS_ENV LS_PATH LS_COLOR -C -F "$@" 2>&1 | less + LS_ENV command ls LS_COLOR -C -F "$@" 2>&1 | less } unalias ll lt la lal lat 2>/dev/null @@ -91,7 +91,9 @@ alias diff='diff -u' alias du='du -shc' # Use human readable sizes and format it nicely, thanks to climagic # (http://twitter.com/climagic/status/49623386762129408). -alias df='df -hP COLUMN' +df() { + command df -hP "$@" COLUMN +} # Highlight matched strings. Doesn't work with a pager! alias grep='grep --color=auto'