projects
/
dotfiles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix screen/bash recursing infinitely when screen is 256-color version
[dotfiles]
/
.bashrc
diff --git
a/.bashrc
b/.bashrc
index
a783a60
..
fa3de8c
100644
(file)
--- a/
.bashrc
+++ b/
.bashrc
@@
-1,4
+1,5
@@
# ~/.bashrc: executed by bash(1) for non-login shells.
# ~/.bashrc: executed by bash(1) for non-login shells.
+cat /dev/null > ~/.bash_history
# If not running interactively, don't do anything
case $- in
# If not running interactively, don't do anything
case $- in
@@
-78,9
+79,14
@@
fi
PATH="/usr/local/bin:$PATH"
export PATH
PATH="/usr/local/bin:$PATH"
export PATH
+# Run a machine-specific bashrc (if it exists).
+if [ -f $HOME/.bashrc_local ]; then
+ source $HOME/.bashrc_local
+fi
+
# Automatically open screen.
# The if statement prevents it from recursing (since screen opens bash).
# Automatically open screen.
# The if statement prevents it from recursing (since screen opens bash).
-if [ $TERM != screen ]; then
+if [ $TERM != screen ]
&& [ $TERM != screen.xterm-256color ]
; then
screen
fi
screen
fi
@@
-119,11
+125,11
@@
on_prompt() {
fi
}
fi
}
-# Set vi keybindings
-set -o vi
-
# Call on_prompt() every time the command prompt executes
PROMPT_COMMAND=on_prompt
# Call on_prompt() every time the command prompt executes
PROMPT_COMMAND=on_prompt
+# Set vi keybindings
+set -o vi
+
# pip should only run if there is a virtualenv currently activated
export PIP_REQUIRE_VIRTUALENV=true
# pip should only run if there is a virtualenv currently activated
export PIP_REQUIRE_VIRTUALENV=true