make scripts work with more shells,
use current variable names.
5 files changed