Skip to content

Commit

Permalink
Use $LS_COLORS to display the colors of the file names if possible.
Browse files Browse the repository at this point in the history
Close #19.
  • Loading branch information
xuhdev committed Oct 19, 2016
1 parent 1fa7c03 commit 6db4163
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions k.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,6 @@ k () {
K_COLOR_OW=$(_k_bsd_to_ansi $LSCOLORS[21] $LSCOLORS[22])
fi

# read colors if linux and $LS_COLORS is defined
# if [[ $(uname) == 'Linux' && -n $LS_COLORS ]]; then

# fi

# ----------------------------------------------------------------------------
# Loop over passed directories and files to display
# ----------------------------------------------------------------------------
Expand Down Expand Up @@ -476,7 +471,12 @@ k () {
# But we don't want to quote '.'; so instead we escape the escape manually and use q-
NAME="${${NAME##*/}//$'\e'/\\e}" # also propagate changes to SYMLINK_TARGET below

if [[ $IS_DIRECTORY == 1 ]]; then
if [[ "$LS_COLORS" ]] && ls --color -d . &>/dev/null; then
# We are using an ls that supports using colors from $LS_COLORS (probably GNU ls here)
pushd "${base_dir}" &>/dev/null
NAME="$(ls --color=always -d "$NAME")"
popd &>/dev/null
elif [[ $IS_DIRECTORY == 1 ]]; then
if [[ $IS_WRITABLE_BY_OTHERS == 1 ]]; then
if [[ $HAS_STICKY_BIT == 1 ]]; then
NAME=$'\e['"$K_COLOR_TW"'m'"$NAME"$'\e[0m';
Expand Down

0 comments on commit 6db4163

Please sign in to comment.