Fish integration: make sure we're not in login mode before sourcing f…

…iles

src/state/opamEnv.ml

@@ -873,12 +873,15 @@ let env_hook_script shell =
     (env_hook_script_base shell)
 
 let source root shell f =
-  let fname = OpamFilename.to_string (OpamPath.init root // f) in
+  let fname = OpamFilename.prettify (OpamPath.init root // f) in
   match shell with
   | SH_csh ->
     Printf.sprintf "if ( -f %s ) source %s >& /dev/null\n" fname fname
   | SH_fish ->
-    Printf.sprintf "source %s > /dev/null 2> /dev/null; or true\n" fname
+    if f = init_file shell then
+      Printf.sprintf "if not status is-login; and test -r %s\n    source %s\nend\n" fname fname
+    else
+      Printf.sprintf "source %s\n" fname
   | SH_sh | SH_bash ->
     Printf.sprintf "test -r %s && . %s > /dev/null 2> /dev/null || true\n"
       fname fname
@@ -911,7 +914,7 @@ let if_interactive_script shell t e =
   | SH_csh ->
     Printf.sprintf "if ( $?prompt ) then\n  %s%sendif\n" t @@ ielse e
   | SH_fish ->
-    Printf.sprintf "if isatty\n  %s%send\n" t @@ ielse e
+    Printf.sprintf "if status is-interactive\n  %s%send\n" t @@ ielse e
   | SH_cmd ->
     Printf.sprintf "echo %%cmdcmdline%% | find /i \"%%~0\" >nul\nif errorlevel 1 (\n%s%s)\n" t @@ ielse_cmd e
   | SH_pwsh _ ->
@@ -1174,7 +1177,8 @@ let setup
           \  Otherwise, every time"
         (OpamConsole.colorise `bold (string_of_shell shell))
         (OpamConsole.colorise `cyan @@ OpamFilename.prettify dot_profile)
-        (OpamConsole.colorise `bold @@ source root shell (init_file shell));
+        (OpamConsole.colorise `bold @@ String.concat "\n    " @@
+          String.split_on_char '\n' (source root shell (init_file shell)));
       | None ->
         OpamConsole.msg "When"
       end;

src/state/shellscripts/env_hook.fish

@@ -1,3 +1,3 @@
-function __opam_env_export_eval --on-event fish_prompt;
-    eval (opam env --shell=fish --readonly 2> /dev/null);
+function __opam_env_export_eval --on-event fish_prompt
+    eval (opam env --shell=fish --readonly 2> /dev/null)
 end