mirror of
https://github.com/ohmybash/oh-my-bash.git
synced 2024-09-21 02:17:11 +00:00
style(lib/bourne-shell): adjust styles
This commit is contained in:
Koichi Murase
parent
2fd5958215
commit
6c73077fa4
@ -3,26 +3,26 @@
|
||||
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
|
||||
|
||||
# make less more friendly for non-text input files, see lesspipe(1)
|
||||
if [ -z "${LESSOPEN}" ];then
|
||||
if [ -f /etc/gentoo-release ]; then
|
||||
if [[ ! $LESSOPEN ]];then
|
||||
if [[ -f /etc/gentoo-release ]]; then
|
||||
export LESSOPEN="|lesspipe %s"
|
||||
else
|
||||
if [ -x /usr/bin/lesspipe ]; then
|
||||
if [[ -x /usr/bin/lesspipe ]]; then
|
||||
eval "$(SHELL=/bin/sh /usr/bin/lesspipe)"
|
||||
elif [ -x /usr/bin/lesspipe.sh ]; then
|
||||
elif [[ -x /usr/bin/lesspipe.sh ]]; then
|
||||
eval "$(SHELL=/bin/sh /usr/bin/lesspipe.sh)"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# set variable identifying the chroot you work in (used in the prompt below)
|
||||
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
|
||||
debian_chroot=$(cat /etc/debian_chroot)
|
||||
if [[ ! ${debian_chroot:-} && -r /etc/debian_chroot ]]; then
|
||||
debian_chroot=$(< /etc/debian_chroot)
|
||||
fi
|
||||
|
||||
# set a fancy prompt (non-color, unless we know we "want" color)
|
||||
case "$TERM" in
|
||||
xterm-color|*-256color) color_prompt=yes;;
|
||||
case $TERM in
|
||||
xterm-color|*-256color) color_prompt=yes;;
|
||||
esac
|
||||
|
||||
# uncomment for a colored prompt, if the terminal has the capability; turned
|
||||
@ -30,8 +30,8 @@ esac
|
||||
# should be on the output of commands, not on the prompt
|
||||
#force_color_prompt=yes
|
||||
|
||||
if [ -n "$force_color_prompt" ]; then
|
||||
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
|
||||
if [[ $force_color_prompt ]]; then
|
||||
if [[ -x /usr/bin/tput ]] && tput setaf 1 &>/dev/null; then
|
||||
# We have color support; assume it's compliant with Ecma-48
|
||||
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
|
||||
# a case would tend to support setf rather than setaf.)
|
||||
@ -41,25 +41,29 @@ if [ -n "$force_color_prompt" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$color_prompt" = yes ]; then
|
||||
if [[ $color_prompt == yes ]]; then
|
||||
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
||||
else
|
||||
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
|
||||
fi
|
||||
unset color_prompt force_color_prompt
|
||||
unset -v color_prompt force_color_prompt
|
||||
|
||||
# If this is an xterm set the title to user@host:dir
|
||||
case "$TERM" in
|
||||
xterm*|rxvt*)
|
||||
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
case $TERM in
|
||||
xterm*|rxvt*)
|
||||
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
# enable color support of ls and also add handy aliases
|
||||
if [ -x /usr/bin/dircolors ]; then
|
||||
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||
if [[ -x /usr/bin/dircolors ]]; then
|
||||
if [[ -r ~/.dircolors ]]; then
|
||||
eval "$(dircolors -b ~/.dircolors)"
|
||||
else
|
||||
eval "$(dircolors -b)"
|
||||
fi
|
||||
#_omb_util_alias ls='dir --color=auto'
|
||||
#_omb_util_alias vdir='vdir --color=auto'
|
||||
|
||||
@ -83,7 +87,7 @@ _omb_util_alias_delayed ls
|
||||
# Add an "alert" alias for long running commands. Use like so:
|
||||
# sleep 10; alert
|
||||
if _omb_util_binary_exists notify-send; then
|
||||
_omb_util_alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
||||
_omb_util_alias alert='notify-send --urgency=low -i "$(if (($? == 0)); then echo terminal; else echo error; fi)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
||||
fi
|
||||
|
||||
# Alias definitions.
|
||||
@ -91,21 +95,21 @@ fi
|
||||
# ~/.bash_aliases, instead of adding them here directly.
|
||||
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
||||
|
||||
if [ -f ~/.bash_aliases ]; then
|
||||
. ~/.bash_aliases
|
||||
if [[ -f ~/.bash_aliases ]]; then
|
||||
. ~/.bash_aliases
|
||||
fi
|
||||
|
||||
if [ -f ~/.bashrc.local ]; then
|
||||
. ~/.bashrc.local
|
||||
if [[ -f ~/.bashrc.local ]]; then
|
||||
. ~/.bashrc.local
|
||||
fi
|
||||
|
||||
# enable programmable completion features (you don't need to enable
|
||||
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
|
||||
# sources /etc/bash.bashrc).
|
||||
if ! shopt -oq posix; then
|
||||
if [ -f /usr/share/bash-completion/bash_completion ]; then
|
||||
if [[ -f /usr/share/bash-completion/bash_completion ]]; then
|
||||
. /usr/share/bash-completion/bash_completion
|
||||
elif [ -f /etc/bash_completion ]; then
|
||||
elif [[ -f /etc/bash_completion ]]; then
|
||||
. /etc/bash_completion
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -72,13 +72,13 @@ function _omb_theme__construct_sgr {
|
||||
function _omb_theme_color_prompt {
|
||||
local out
|
||||
_omb_theme__construct_sgr "$@"
|
||||
echo "\[\e[${out}m\]"
|
||||
_omb_util_print "\[\e[${out}m\]"
|
||||
}
|
||||
|
||||
function _omb_theme_color_echo {
|
||||
local out
|
||||
_omb_theme__construct_sgr "$@"
|
||||
echo "\033[${out}m"
|
||||
_omb_util_print "\033[${out}m"
|
||||
}
|
||||
|
||||
function _omb_prompt_color_initialize {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user