Auto merge of #2822 - oli-obk:rustup, r=oli-obk

Correctly quote env vars in single quoted string in bash

single quotes don't allow env vars. So we unquote the single quote, start a double quote for where we use env vars and then unquote the double quote and continue with the single quote.

Author: bors