Merge branch 'master' of git://github.com/joelthelion/autojump

autojump.sh

@@ -1,4 +1,6 @@
-if [ $SHELL = "/bin/bash" ]; then
+#This shell snippet sets the prompt command and the necessary aliases
+#Only excecute if the shell is bash and it is interactive
+if [ $SHELL = "/bin/bash" ] && [ -n "$PS1" ]; then
     export PROMPT_COMMAND='autojump -a "$(pwd -P)";'"$PROMPT_COMMAND"
     alias jumpstat="autojump --stat"
     function j { new_path=$(autojump $@);if [ -n "$new_path" ]; then echo -e "\\033[31m${new_path}\\033[0m"; echo; cd "$new_path";fi }