Merge branch '4605_ash_dash_env_init'

Signed-off-by: Yury V. Zaytsev <[email protected]>
MidnightCommander · Jan 12, 2025 · 9fe4fb8 · 9fe4fb8
2 parents dbc92b8 + 8f9ddb2
commit 9fe4fb8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/subshell/common.c b/src/subshell/common.c
@@ -360,8 +360,9 @@ init_subshell_child (const char *pty_name)
             init_file = g_strdup (".profile");
         }
 
-        /* Put init file to ENV variable used by ash */
-        g_setenv ("ENV", init_file, TRUE);
+        /* Put init file to ENV variable used by ash but only if it
+           is not already set. */
+        g_setenv ("ENV", init_file, FALSE);
 
         break;