fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Remove bashrc prefix from functions

Browse source
This commit is contained in:
Fernando Schauenburg 2019-10-31 01:44:07 +01:00
parent 616b026f4a
commit 5319e2de68
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dotfiles/.bashrc
View file

@ -101,8 +101,8 @@ GIT_PS1_SHOWUNTRACKEDFILES=1
GIT_PS1_SHOWUPSTREAM=verbose GIT_PS1_SHOWUPSTREAM=verbose
PS2="... " PS2="... "
PROMPT_COMMAND=bashrc_set_prompt PROMPT_COMMAND=_set_prompt
bashrc_set_prompt() { _set_prompt() {
local exit_code=$? prompt=$(printf '\$%.0s' $(seq 1 $SHLVL)) pyvenv="" local exit_code=$? prompt=$(printf '\$%.0s' $(seq 1 $SHLVL)) pyvenv=""
if ! [ -z "$VIRTUAL_ENV" ]; then if ! [ -z "$VIRTUAL_ENV" ]; then
@ -186,16 +186,16 @@ alias myip="curl https://ifconfig.co"
#alias myip="curl https://ifconfig.me" #alias myip="curl https://ifconfig.me"
#alias myip="dig +short myip.opendns.com @resolver1.opendns.com" #alias myip="dig +short myip.opendns.com @resolver1.opendns.com"
alias light='bashrc_update_colors light' alias light='_update_colors light'
alias dark='bashrc_update_colors dark' alias dark='_update_colors dark'
bashrc_send_osc() { _send_osc() {
local OSC="\E]" ST="\E\\" local OSC="\E]" ST="\E\\"
if [ -n "$TMUX" ]; then OSC="\EPtmux;\E\E]"; fi if [ -n "$TMUX" ]; then OSC="\EPtmux;\E\E]"; fi
echo -ne "$OSC$1$ST" echo -ne "$OSC$1$ST"
} }
bashrc_update_colors() { _update_colors() {
export BACKGROUND="$1" export BACKGROUND="$1"
local cursor=$Red_RGB fg=$Base1_RGB bg=$Base03_RGB local cursor=$Red_RGB fg=$Base1_RGB bg=$Base03_RGB
@ -204,7 +204,7 @@ bashrc_update_colors() {
local n rgb comment local n rgb comment
if [ -n "$ITERM_SESSION_ID" ] if [ -n "$ITERM_SESSION_ID" ]
then # iTerm2 then # iTerm2
while read n rgb comment; do bashrc_send_osc "P$n$rgb"; done <<EOL while read n rgb comment; do _send_osc "P$n$rgb"; done <<EOL
0 $Base02_RGB 0 $Base02_RGB
1 $Red_RGB 1 $Red_RGB
2 $Green_RGB 2 $Green_RGB
@ -230,7 +230,7 @@ bashrc_update_colors() {
m $cursor Cursor text m $cursor Cursor text
EOL EOL
else # assume xterm else # assume xterm
while read n rgb comment; do bashrc_send_osc "4;$n;#$rgb"; done <<EOL while read n rgb comment; do _send_osc "4;$n;#$rgb"; done <<EOL
0 $Base02_RGB 0 $Base02_RGB
1 $Red_RGB 1 $Red_RGB
2 $Green_RGB 2 $Green_RGB
@ -248,7 +248,7 @@ EOL
14 $Base1_RGB 14 $Base1_RGB
15 $Base3_RGB 15 $Base3_RGB
EOL EOL
while read n rgb comment; do bashrc_send_osc "$n;#$rgb"; done <<EOL while read n rgb comment; do _send_osc "$n;#$rgb"; done <<EOL
10 $fg Foreground 10 $fg Foreground
11 $bg Background 11 $bg Background
12 $cursor Cursor 12 $cursor Cursor
@ -324,7 +324,7 @@ colortest() {
############################################################################## ##############################################################################
stty -ixon # disable ctrl-s and ctrl-q stty -ixon # disable ctrl-s and ctrl-q
bashrc_update_colors "${BACKGROUND:-dark}" _update_colors "${BACKGROUND:-dark}"
# Enable available completion helpers # Enable available completion helpers
if [ -d /usr/local/etc/bash_completion.d ]; then if [ -d /usr/local/etc/bash_completion.d ]; then