Merge branch 'master' into parsed

This commit is contained in:
ridiculousfish
2013-06-09 13:52:18 -07:00
26 changed files with 397 additions and 262 deletions

View File

@@ -2042,7 +2042,7 @@ int parser_t::parse_job(process_t *p,
free(cpy);
}
else if (cmd[0]==L'$')
else if (cmd[0]==L'$' || cmd[0] == VARIABLE_EXPAND || cmd[0] == VARIABLE_EXPAND_SINGLE)
{
const env_var_t val_wstr = env_get_string(cmd+1);