Fix bash prompt, cabal-install and ghc.

This commit is contained in:
Ivan Malison 2014-11-08 15:28:01 -08:00
parent 796bfed264
commit ab33ef7a58
3 changed files with 4 additions and 9 deletions

View File

@ -32,6 +32,7 @@
"bash", "bash",
"binutils", "binutils",
"brew-cask", "brew-cask",
"cabal-install",
"cairo", "cairo",
"cmake", "cmake",
"coreutils", "coreutils",
@ -50,6 +51,7 @@
"gdbm", "gdbm",
"gdk-pixbuf", "gdk-pixbuf",
"gettext", "gettext",
"ghc",
"gist", "gist",
"git", "git",
"giter8", "giter8",

@ -1 +1 @@
Subproject commit 4cfc0e42cca13c26ec02bd4beea26c37e02da8e9 Subproject commit 30d80f4998d74155818e6db48bc5c8d17c4926ae

View File

@ -34,13 +34,6 @@ function git_status_character() {
fi fi
} }
function sandbox_prompt() {
if [ ! -z "$(sandbox_prompt_info)" ];
then
echo " $(separator "with") $(colored_sandbox_string)%{$reset_color%}"
fi
}
function command_line_character() { function command_line_character() {
if ! test -z $(git branch-or-sha); if ! test -z $(git branch-or-sha);
then then
@ -68,7 +61,7 @@ function separator() {
prompt_basic_colors prompt_basic_colors
function set_bash_prompt() { function set_bash_prompt() {
PS1="╭─$(print_with_color "$(whoami)" "$USERNAME_COLOR") $(separator "at") $(print_with_color "`hostname -s`" "$HOSTNAME_COLOR") $(separator "in") $(print_with_color "`current_directory`" "$CURRENT_DIRECTORY_COLOR")$(git_prompt_info)$(sandbox_prompt) PS1="╭─$(print_with_color "$(whoami)" "$USERNAME_COLOR") $(separator "at") $(print_with_color "`hostname -s`" "$HOSTNAME_COLOR") $(separator "in") $(print_with_color "`current_directory`" "$CURRENT_DIRECTORY_COLOR")$(git_prompt_info)
╰─$(command_line_character) " ╰─$(command_line_character) "
} }