mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-25 04:13:08 +00:00
Move code in etc/config.fish to share/config.fish
instead add a bit of information on how fish's configuration works for the admin to etc/config.fish. This means that fish is fully functional without /etc, which might be nice for "stateless" systems.
This commit is contained in:
parent
6a16bdb808
commit
6288f89bf9
2 changed files with 42 additions and 29 deletions
|
@ -1,30 +1,14 @@
|
|||
#
|
||||
# Init file for fish
|
||||
#
|
||||
|
||||
#
|
||||
# Some things should only be done for login terminals
|
||||
#
|
||||
|
||||
if status --is-login
|
||||
|
||||
# Check for i18n information in
|
||||
# /etc/sysconfig/i18n
|
||||
|
||||
if test -f /etc/sysconfig/i18n
|
||||
eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
|
||||
end
|
||||
|
||||
#
|
||||
# Put linux consoles in unicode mode.
|
||||
#
|
||||
|
||||
if test "$TERM" = linux
|
||||
if expr "$LANG" : ".*\.[Uu][Tt][Ff].*" >/dev/null
|
||||
if which unicode_start >/dev/null
|
||||
unicode_start
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
# Put system-wide fish configuration entries here
|
||||
# or in .fish files in conf.d/
|
||||
# Files in conf.d can be overridden by the user
|
||||
# by files with the same name in $XDG_CONFIG_HOME/fish/conf.d
|
||||
|
||||
# This file is run by all fish instances.
|
||||
# To include configuration only for login shells, use
|
||||
# if status --is-login
|
||||
# ...
|
||||
# end
|
||||
# To include configuration only for interactive shells, use
|
||||
# if status --is-interactiv
|
||||
# ...
|
||||
# end
|
||||
|
|
|
@ -176,3 +176,32 @@ if not set -q __fish_init_2_3_0
|
|||
set fish_user_abbreviations $fab
|
||||
set -U __fish_init_2_3_0
|
||||
end
|
||||
|
||||
#
|
||||
# Some things should only be done for login terminals
|
||||
# This used to be in etc/config.fish - keep it here to keep the semantics
|
||||
#
|
||||
|
||||
if status --is-login
|
||||
|
||||
# Check for i18n information in
|
||||
# /etc/sysconfig/i18n
|
||||
|
||||
if test -f /etc/sysconfig/i18n
|
||||
string match -r '^[a-zA-Z]*=.*' < /etc/sysconfig/i18n | while read -l line
|
||||
set -gx (string split '=' -m 1 -- $line | string replace -ra '"([^"]+)"' '$1' | string replace -ra "'([^']+)'" '$1')
|
||||
end
|
||||
end
|
||||
|
||||
#
|
||||
# Put linux consoles in unicode mode.
|
||||
#
|
||||
|
||||
if test "$TERM" = linux
|
||||
if string match -qir '\.UTF' -- $LANG
|
||||
if command -s unicode_start >/dev/null
|
||||
unicode_start
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue