Skip to content

Commit

Permalink
Change UNAME and JAILED to ZNKR_UNAME and ZNKR_JAILED
Browse files Browse the repository at this point in the history
  • Loading branch information
zunkree committed Sep 29, 2011
1 parent 20dd5ff commit 68780d7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
# serial line.
# Use cons25l1 for iso-* fonts
# export TERM=cons25
UNAME="`uname`"; export UNAME
ZNKR_UNAME="`uname`"; export ZNKR_UNAME
BLOCKSIZE=K; export BLOCKSIZE
EDITOR=vim; export EDITOR
PAGER=less; export PAGER

if [[ "${UNAME}" == "FreeBSD" ]] ; then
JAILED="`sysctl -n security.jail.jailed`"; export JAILED
ZNKR_JAILED="`sysctl -n security.jail.jailed`"; export ZNKR_JAILED
fi

if [[ -f /etc/profile.d/bash-completion.sh ]] ; then
source /etc/profile.d/bash-completion.sh
fi

if [[ "${UNAME}" == "FreeBSD" ]] ; then
if [[ "${ZNKR_UNAME}" == "FreeBSD" ]] ; then
alias ls='ls -G'
else
alias ls='ls --color=auto'
Expand Down
6 changes: 3 additions & 3 deletions .bashrc.d/promptrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if [[ "${UNAME}" == "FreeBSD" ]] ; then
if [[ "${ZNKR_UNAME}" == "FreeBSD" ]] ; then
case ${TERM} in
xterm*|rxvt*|Eterm|aterm|kterm|gnome*|interix)
PROMPT_COMMAND='echo -ne "\033]0;${HOSTNAME%%.*}\007"'
Expand All @@ -19,13 +19,13 @@ if [[ "${UNAME}" == "FreeBSD" ]] ; then
fi

if [[ ${EUID} == 0 ]] ; then
if [[ ${JAILED} == 0 ]] ; then
if [[ ${ZNKR_JAILED} == 0 ]] ; then
PS1='\[\033[01;31m\]\u\[\033[00m\]@\[\033[01;35m\]\h\[\033[01;34m\] \w \$\[\033[00m\] '
else
PS1='\[\033[01;31m\]\u\[\033[00m\]@\[\033[01;30m\]\h\[\033[01;34m\] \w \$\[\033[00m\] '
fi
else
if [[ ${JAILED} == 0 ]] ; then
if [[ ${ZNKR_JAILED} == 0 ]] ; then
PS1='\[\033[01;32m\]\u\[\033[00m\]@\[\033[01;35m\]\h\[\033[01;34m\] \w \$\[\033[00m\] '
else
PS1='\[\033[01;32m\]\u\[\033[00m\]@\[\033[01;30m\]\h\[\033[01;34m\] \w \$\[\033[00m\] '
Expand Down

0 comments on commit 68780d7

Please sign in to comment.