Skip to content

Commit

Permalink
update grml zsh
Browse files Browse the repository at this point in the history
  • Loading branch information
jiridanek committed Jun 4, 2024
1 parent 7e69902 commit 09e1717
Showing 1 changed file with 17 additions and 14 deletions.
31 changes: 17 additions & 14 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -891,14 +891,21 @@ function grmlcomp () {
fi

# host completion
_etc_hosts=()
_ssh_config_hosts=()
_ssh_hosts=()
if is42 ; then
[[ -r ~/.ssh/config ]] && _ssh_config_hosts=(${${(s: :)${(ps:\t:)${${(@M)${(f)"$(<$HOME/.ssh/config)"}:#Host *}#Host }}}:#*[*?]*}) || _ssh_config_hosts=()
[[ -r ~/.ssh/known_hosts ]] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
[[ -r /etc/hosts ]] && [[ "$NOETCHOSTS" -eq 0 ]] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(grep -v '^0\.0\.0.\0\|^127\.0\.0\.1\|^::1 ' /etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
else
_ssh_config_hosts=()
_ssh_hosts=()
_etc_hosts=()
if [[ -r ~/.ssh/config ]] ; then
_ssh_config_hosts=(${${(s: :)${(ps:\t:)${${(@M)${(f)"$(<$HOME/.ssh/config)"}:#Host *}#Host }}}:#*[*?]*})
fi

if [[ -r ~/.ssh/known_hosts ]] ; then
_ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*})
fi

if [[ -r /etc/hosts ]] && [[ "$NOETCHOSTS" -eq 0 ]] ; then
: ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(grep -v '^0\.0\.0\.0\|^127\.0\.0\.1\|^::1 ' /etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}}
fi
fi

local localname
Expand Down Expand Up @@ -2678,8 +2685,8 @@ else
fi

# use ip from iproute2 with color support
if ip --color=auto addr show dev lo >/dev/null 2>&1; then
alias ip='command ip --color=auto'
if ip -color=auto addr show dev lo >/dev/null 2>&1; then
alias ip='command ip -color=auto'
fi

if [[ -r /proc/mdstat ]]; then
Expand Down Expand Up @@ -2841,7 +2848,7 @@ if [ -e /var/log/syslog ] ; then
#a1# Take a look at the syslog: \kbd{\$PAGER /var/log/syslog || journalctl}
salias llog="$PAGER /var/log/syslog" # take a look at the syslog
#a1# Take a look at the syslog: \kbd{tail -f /var/log/syslog || journalctl}
salias tlog="tail -f /var/log/syslog" # follow the syslog
salias tlog="tail --follow=name /var/log/syslog" # follow the syslog
elif check_com -c journalctl ; then
salias llog="journalctl"
salias tlog="journalctl -f"
Expand Down Expand Up @@ -3948,7 +3955,3 @@ unfunction grml_status_feature
# Local variables:
# mode: sh
# End:

# Add JBang to environment
alias j!=jbang
export PATH="$HOME/.jbang/bin:$PATH"

0 comments on commit 09e1717

Please sign in to comment.