quote variables and remove echos as Docker baulks at them