Sorry, I should update the article with the better solution, it's just a few more lines:

https://github.com/bag-man/dotfiles/blob/master/bashrc#L116-...