From fd7100b7a0dabfc0b5f5bf3a84dd56ed456930f3 Mon Sep 17 00:00:00 2001 From: drm00 Date: Wed, 6 Nov 2013 12:45:28 +0100 Subject: [PATCH] add check for colored ls on openbsd. --- lib/theme-and-appearance.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 0353f9db4..c4effb1b1 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -12,9 +12,11 @@ then # otherwise, leave ls as is, because NetBSD's ls doesn't support -G gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' elif [[ "$(uname -s)" == "OpenBSD" ]]; then - # On OpenBSD, test if "colorls" is installed (this one supports colors); - # otherwise, leave ls as is, because OpenBSD's ls doesn't support -G - colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G' + # On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base, with color and + # multibyte support) are available from ports. "colorls" will be installed on purpose + # and can't be pulled in by installing coreutils, so prefer it to "gls". + gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' + colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G' else ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G' fi