von/vdotfiles
1
0
Fork 0
Code Activity

replace hostname with fqdn because teh conventions

Browse source
This commit is contained in:
Von Random 2015-12-09 13:28:29 +03:00
parent f919e3394f
commit 7dcbdc5ddf
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shellrc
View file

@ -14,6 +14,11 @@ else
alias whence='type -P' alias whence='type -P'
fi fi
export fqdn="$(hostname -f)"
if [[ -z ${fqdn} ]]; then
export fqdn="${HOSTNAME}"
fi
newline=" newline="
" "
vscripts="${HOME}/vscripts" vscripts="${HOME}/vscripts"
@ -77,7 +82,7 @@ fi
# ls # ls
if [[ ${OSTYPE} == freebsd* ]]; then if [[ ${OSTYPE} == freebsd* ]]; then
alias ls='command ls -G ' alias ls='command ls -G '
elif [[ ${OSTYPE} == 'linux-gnu' || ${OSTYPE} == 'cygwin' ]] && [[ ${HOSTNAME} != *pvc* ]]; then elif [[ ${OSTYPE} == 'linux-gnu' || ${OSTYPE} == 'cygwin' ]] && [[ ${fqdn} != *pvc* ]]; then
alias ls='command ls --color=auto --group-directories-first ' alias ls='command ls --color=auto --group-directories-first '
fi fi
alias la='ls -FA' alias la='ls -FA'
@ -246,7 +251,7 @@ if is_zsh; then
rb=' ]' rb=' ]'
bb=':' bb=':'
prompt_user='%(1000#..%(1205#..%F{red}%n%f%b ))' prompt_user='%(1000#..%(1205#..%F{red}%n%f%b ))'
prompt_host='%M' prompt_host=${fqdn}
prompt_cwd='%B%d%b' prompt_cwd='%B%d%b'
prompt_bang='%(!.%F{red}>%f.%B>%b)' prompt_bang='%(!.%F{red}>%f.%B>%b)'
prompt_jobs='%(1j. jobs:%B%F{red}%j%f%b.)' prompt_jobs='%(1j. jobs:%B%F{red}%j%f%b.)'
@ -366,7 +371,7 @@ else
lb="[ " lb="[ "
rb=" ]" rb=" ]"
bb=":" bb=":"
prompt_host="$HOSTNAME" prompt_host="${fqdn}"
prompt_bang=">${reset}" prompt_bang=">${reset}"
precmd() { precmd() {
if [[ -z ${hide_info} ]]; then if [[ -z ${hide_info} ]]; then