scripts: fix regression on reuse of shell environment variables