fix: improve env variable substitution logic, only replace variables wrapped in curly braces (${var})#894