Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed infinite loop on login.

  • Loading branch information...
commit 1dccb4db0ad98ab6b20ce6cc32a439b80b84c55e 1 parent 31120d5
Brad Lhotsky authored
Showing with 6 additions and 11 deletions.
  1. +2 −4 bash_profile
  2. +4 −7 bashrc
6 bash_profile
View
@@ -1,7 +1,6 @@
# .bash_profile
# -------------
# Set up the prompt, and export variables
-export PROFILED=1
# Colors:
txtblk='\e[0;30m' # Black - Regular
@@ -87,10 +86,9 @@ fi;
# User specific environment and startup programs
VCPROMPT_FORMAT="$bldblk[$txtcyn%n$blkblk:$txtgrn%b$bldblk@$txtred%r $txtpur%m%u$bldblk]";
PROMPT_COMMAND=before_prompt
-#PS1="\[\033[1;30m\]=\[\033[0;36m\]\h\[\033[1;30m\](\[\033[0;31m\]$(tty | sed s:/dev/::)\[\033[1;30m\]):\[\033[0;36m\]\$(pwd) \$(vcprompt)\[\033[1;30m\]=\n\[\033[1;30m\][\[\033[1;31m\]\t \[\033[1;36m\]\u\[\033[1;30m\]]\]\033[0;37m\]\\\$ \[\033[0m\]"
PS1="\[$(get_user_color)\]\u\[$bldblk\]@\[$host_color\]\h \[$(get_user_color)\]\\\$ \[$txtrst\]"
-BASH_ENV=$HOME/.bashrc
+#BASH_ENV=$HOME/.bashrc
USERNAME=""
EDITOR="vim"
-export USERNAME BASH_ENV EDITOR VCPROMPT_FORMAT PS1 PROMPT_COMMAND
+export USERNAME EDITOR VCPROMPT_FORMAT PS1 PROMPT_COMMAND
11 bashrc
View
@@ -27,8 +27,6 @@ path_inject /opt/perl/current/bin
path_inject /usr/pgsql-9.0/bin
path_inject $HOME/bin
-export BASHRC=1
-export LESS="-RM"
# Operating System Based Decisions
HOSTOS=`uname -s`
@@ -45,6 +43,7 @@ fi;
alias who='who -H -u -T'
alias root='root_login';
alias screen="TERM=ansi screen"
+export LESS="-RM"
#
# Interactive Shells only
@@ -55,9 +54,9 @@ if [ "$PS1" ]; then
export HISTCONTROL="ignoredups"
export HISTIGNORE="&:ls:[bf]g:exit"
- if [ "$PROFILED" != "0" ]; then
- . $HOME/.bash_profile
- fi;
+# if [ -z "$PROFILED" ] && [ -e ~/.bash_profile ]; then
+# . ~/.bash_profile
+# fi;
fi;
# Perl Brew
@@ -125,5 +124,3 @@ function contents() {
ls -lh $1
fi
}
-
-
Please sign in to comment.
Something went wrong with that request. Please try again.