Updated bash completion for different possible locations