improve sourcing of env.sh