fix: improve env variable substitution logic, only replace variables …

fix: improve env variable substitution logic, only replace variables … #89