shell/aliases: use `command`

No need to store the absolute path to the binary.

diff --git a/setup.sh b/setup.sh
index e40249a956651eb5bbb93f7b2a1d7a3f39ea6005..08efb21e3da725828b957307d14bc633ded08f9b 100755 (executable)
--- 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 d60bd522d4450caf69160ea9607ca69114601521..02958dad1dcd82dcb9db932e8f92cf9549df1a28 100644 (file)
--- 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'