Merge branch 'master' into next

This commit is contained in:
Ben Hilburn 2016-02-05 10:57:56 -08:00
commit 4897c795fa
4 changed files with 19 additions and 0 deletions

View file

@ -302,6 +302,15 @@ prompt_aws() {
fi
}
# Current Elastic Beanstalk environment
prompt_aws_eb_env() {
local eb_env=$(grep environment .elasticbeanstalk/config.yml 2> /dev/null | awk '{print $2}')
if [[ -n "$eb_env" ]]; then
"$1_prompt_segment" "$0" "$2" black green "$eb_env" 'AWS_EB_ICON'
fi
}
# Segment to indicate background jobs with an icon.
set_default POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE true
prompt_background_jobs() {