Merge remote-tracking branch 'ben/next' into go_prompt

This commit is contained in:
Dominik Ritter 2015-10-16 19:55:44 +02:00
commit ab3577a795
2 changed files with 103 additions and 438 deletions

View file

@ -317,8 +317,7 @@ esac
# `sed` is unfortunately not consistent across OSes when it comes to flags.
SED_EXTENDED_REGEX_PARAMETER="-r"
if [[ "$OS" == 'OSX' ]]; then
local IS_BSD_SED
IS_BSD_SED=$(sed --version &>> /dev/null || echo "BSD sed")
local IS_BSD_SED="$(sed --version &>> /dev/null || echo "BSD sed")"
if [[ -n "$IS_BSD_SED" ]]; then
SED_EXTENDED_REGEX_PARAMETER="-E"
fi