]>
Commit | Line | Data |
---|---|---|
315debac KK |
1 | --- main.c~ 2011-07-07 18:15:26.961632040 +0100 |
2 | +++ main.c 2011-07-07 18:15:50.664694256 +0100 | |
3 | @@ -532,10 +532,14 @@ | |
bbdaf468 KK |
4 | char *env_file; |
5 | ||
bbdaf468 | 6 | /* include $ENV */ |
315debac KK |
7 | - env_file = substitute(substitute("${ENV:-" MKSHRC_PATH "}", 0), |
8 | - DOTILDE); | |
ef1ae712 | 9 | + env_file = substitute(substitute("${ENV}", 0), DOTILDE); |
315debac | 10 | if (*env_file != '\0') |
9b0c41bb | 11 | include(env_file, 0, NULL, true); |
315debac KK |
12 | + else { |
13 | + env_file = substitute(MKSHRC_PATH, DOTILDE); | |
9b0c41bb JR |
14 | + include("/etc/mkshrc", 0, NULL, true); |
15 | + include(env_file, 0, NULL, true); | |
315debac KK |
16 | + } |
17 | } | |
18 | ||
19 | if (restricted) { |