Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-03 16:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Additional checks for -F support

Browse source 
(cherry picked from commit 93b3a0c1f5)
This commit is contained in:
Nicholas Rodrigues Lordello 2023-11-02 13:00:58 +01:00 committed by Fabian Boehm
parent 66401f8575
commit f775ab6ef4
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
share/functions/ls.fish
View file

@ -7,16 +7,18 @@ function ls --description "List contents of directory"
# Solaris 11's ls command takes a --color flag. # Solaris 11's ls command takes a --color flag.
# OpenBSD requires the separate colorls program for color support. # OpenBSD requires the separate colorls program for color support.
# Also test -F because we'll want to define this function even with an ls that can't do colors (like NetBSD). # Also test -F because we'll want to define this function even with an ls that can't do colors (like NetBSD).
if not set -q __fish_ls_color_opt if not set -q __fish_ls_command
set -g __fish_ls_color_opt
set -g __fish_ls_command ls set -g __fish_ls_command ls
set -g __fish_ls_color_opt
set -g __fish_ls_indicators_opt
# OpenBSD ships a command called "colorls" that takes "-G" and "-F", # OpenBSD ships a command called "colorls" that takes "-G" and "-F",
# but there's also a ruby implementation that doesn't understand "-F". # but there's also a ruby implementation that doesn't understand "-F".
# Since that one's quite different, don't use it. # Since that one's quite different, don't use it.
if command -sq colorls if command -sq colorls
and command colorls -GF >/dev/null 2>/dev/null and command colorls -GF >/dev/null 2>/dev/null
set -g __fish_ls_color_opt -G
set -g __fish_ls_command colorls set -g __fish_ls_command colorls
set -g __fish_ls_color_opt -G
set -g __fish_ls_indicators_opt -F
else else
for opt in --color=auto -G --color for opt in --color=auto -G --color
if command ls $opt / >/dev/null 2>/dev/null if command ls $opt / >/dev/null 2>/dev/null
@ -24,12 +26,16 @@ function ls --description "List contents of directory"
break break
end end
end end
if command ls -F / >/dev/null 2>/dev/null
set -g __fish_ls_indicators_opt -F
end
end end
end end
set -l opt set -l indicators_opt
isatty stdout isatty stdout
and set -a opt -F and set -a indicators_opt $__fish_ls_indicators_opt
# Terminal.app doesn't set $COLORTERM or $CLICOLOR, # Terminal.app doesn't set $COLORTERM or $CLICOLOR,
# but the new FreeBSD ls requires either to be set, # but the new FreeBSD ls requires either to be set,
@ -40,5 +46,5 @@ function ls --description "List contents of directory"
test "$TERM_PROGRAM" = Apple_Terminal test "$TERM_PROGRAM" = Apple_Terminal
and set -lx CLICOLOR 1 and set -lx CLICOLOR 1
command $__fish_ls_command $__fish_ls_color_opt $opt $argv command $__fish_ls_command $__fish_ls_color_opt $indicators_opt $argv
end end