mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 12:53:13 +00:00
Move __fish_set_lscolors to ls.fish
It's not used anywhere else. [ci skip]
This commit is contained in:
parent
2a4c545b21
commit
f1a59e83c5
2 changed files with 19 additions and 18 deletions
|
@ -1,18 +0,0 @@
|
||||||
function __fish_set_lscolors --description 'Set $LS_COLORS if possible'
|
|
||||||
if ! set -qx LS_COLORS && set -l cmd (command -s {g,}dircolors)[1]
|
|
||||||
set -l colorfile
|
|
||||||
for file in ~/.dir_colors ~/.dircolors /etc/DIR_COLORS
|
|
||||||
if test -f $file
|
|
||||||
set colorfile $file
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
# Here we rely on the legacy behavior of `dircolors -c` producing output
|
|
||||||
# suitable for csh in order to extract just the data we're interested in.
|
|
||||||
set -gx LS_COLORS ($cmd -c $colorfile | string split ' ')[3]
|
|
||||||
# The value should always be quoted but be conservative and check first.
|
|
||||||
if string match -qr '^([\'"]).*\1$' -- $LS_COLORS
|
|
||||||
set LS_COLORS (string match -r '^.(.*).$' $LS_COLORS)[2]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,3 +1,22 @@
|
||||||
|
function __fish_set_lscolors --description 'Set $LS_COLORS if possible'
|
||||||
|
if ! set -qx LS_COLORS && set -l cmd (command -s {g,}dircolors)[1]
|
||||||
|
set -l colorfile
|
||||||
|
for file in ~/.dir_colors ~/.dircolors /etc/DIR_COLORS
|
||||||
|
if test -f $file
|
||||||
|
set colorfile $file
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
# Here we rely on the legacy behavior of `dircolors -c` producing output
|
||||||
|
# suitable for csh in order to extract just the data we're interested in.
|
||||||
|
set -gx LS_COLORS ($cmd -c $colorfile | string split ' ')[3]
|
||||||
|
# The value should always be quoted but be conservative and check first.
|
||||||
|
if string match -qr '^([\'"]).*\1$' -- $LS_COLORS
|
||||||
|
set LS_COLORS (string match -r '^.(.*).$' $LS_COLORS)[2]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function ls --description "List contents of directory"
|
function ls --description "List contents of directory"
|
||||||
# Make ls use colors and show indicators if we are on a system that supports that feature and writing to stdout.
|
# Make ls use colors and show indicators if we are on a system that supports that feature and writing to stdout.
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue