aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ksh/kshrc.d/unalias.ksh2
-rw-r--r--sh/shrc.d/ls.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/ksh/kshrc.d/unalias.ksh b/ksh/kshrc.d/unalias.ksh
deleted file mode 100644
index 44905209..00000000
--- a/ksh/kshrc.d/unalias.ksh
+++ /dev/null
@@ -1,2 +0,0 @@
-# OpenBSD likes to define ls as an alias, but I don't
-unalias ls
diff --git a/sh/shrc.d/ls.sh b/sh/shrc.d/ls.sh
index 11ab15b4..1aca767e 100644
--- a/sh/shrc.d/ls.sh
+++ b/sh/shrc.d/ls.sh
@@ -2,6 +2,10 @@
# options for us; if not, we won't be wrapping ls(1) with a function at all
[ -d "$HOME"/.cache/ls ] || return
+# If the system has already aliased ls(1) for us, like Slackware or OpenBSD
+# does, just get rid of it
+unalias ls >/dev/null 2>&1
+
# Define function proper
ls() {