Properly namespace internal functions
This commit is contained in:
parent
995cd4cb00
commit
d2ec8189d6
|
@ -1,12 +1,12 @@
|
||||||
reset-elapsed() {
|
cattle-reset-elapsed() {
|
||||||
(( last_cmd_at = SECONDS ))
|
(( last_cmd_at = SECONDS ))
|
||||||
}
|
}
|
||||||
|
|
||||||
ping-timer() {
|
cattle-ping-timer() {
|
||||||
kill -USR1 "$reaper_pid"
|
kill -USR1 "$reaper_pid"
|
||||||
}
|
}
|
||||||
|
|
||||||
slay-reaper() {
|
cattle-slay-reaper() {
|
||||||
kill -KILL "$reaper_pid"
|
kill -KILL "$reaper_pid"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ cd() {
|
||||||
|
|
||||||
{
|
{
|
||||||
trap "" INT
|
trap "" INT
|
||||||
trap reset-elapsed USR1
|
trap cattle-reset-elapsed USR1
|
||||||
last_cmd_at=0
|
last_cmd_at=0
|
||||||
|
|
||||||
while sleep 1; do
|
while sleep 1; do
|
||||||
|
@ -30,8 +30,8 @@ cd() {
|
||||||
done
|
done
|
||||||
} &
|
} &
|
||||||
|
|
||||||
reaper_pid=$! PROMPT_COMMAND+=(ping-timer)
|
reaper_pid=$! PROMPT_COMMAND+=(cattle-ping-timer)
|
||||||
trap slay-reaper EXIT
|
trap cattle-slay-reaper EXIT
|
||||||
|
|
||||||
if [[ -f /tmp/iterm2-prev-dir.txt ]]; then
|
if [[ -f /tmp/iterm2-prev-dir.txt ]]; then
|
||||||
cur_time=$(date +%s)
|
cur_time=$(date +%s)
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
_ssh_hosts() {
|
tab-ssh-hosts() {
|
||||||
mapfile -t hosts < <(awk 'tolower($1) == "host" { print $2 }' ~/.ssh/config)
|
mapfile -t hosts < <(awk 'tolower($1) == "host" { print $2 }' ~/.ssh/config)
|
||||||
mapfile -t COMPREPLY < <(compgen -W "${hosts[*]}" -- "${COMP_WORDS[COMP_CWORD]}")
|
mapfile -t COMPREPLY < <(compgen -W "${hosts[*]}" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
complete -o default -F _ssh_hosts ssh scp ssh-copy-id sftp
|
complete -o default -F tah-ssh-hosts ssh scp ssh-copy-id sftp
|
||||||
|
|
||||||
_make_targets() {
|
tab-make-targets() {
|
||||||
local arg prev file targets
|
local arg prev file targets
|
||||||
|
|
||||||
if [[ -f makefile ]]; then
|
if [[ -f makefile ]]; then
|
||||||
|
@ -34,4 +34,4 @@ _make_targets() {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
complete -o default -F _make_targets make gmake
|
complete -o default -F tab-make-targets make gmake
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
setup-prompt() {
|
prompt-init() {
|
||||||
local last_res=$? color=$PS1_color_success
|
local last_res=$? color=$PS1_color_success
|
||||||
PS1="\w "
|
PS1="\w "
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ setup-prompt() {
|
||||||
PS1+="\[$color\][$last_res]\[$PS1_color_reset\] $PS1_prompt_sym "
|
PS1+="\[$color\][$last_res]\[$PS1_color_reset\] $PS1_prompt_sym "
|
||||||
}
|
}
|
||||||
|
|
||||||
PROMPT_COMMAND+=(setup-prompt)
|
PROMPT_COMMAND+=(prompt-init)
|
||||||
|
|
||||||
PS1_prompt_sym=λ
|
PS1_prompt_sym=λ
|
||||||
PS1_hostname=${HOSTNAME-"$(hostname)"}
|
PS1_hostname=${HOSTNAME-"$(hostname)"}
|
||||||
|
|
Loading…
Reference in New Issue