More fish-shell related fixes

* Use "source" instead of "." * Handle CDPATH in `opam config env`
ocaml · May 31, 2015 · adf191b · adf191b
1 parent c87a280
commit adf191b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/client/opamConfigCommand.ml b/src/client/opamConfigCommand.ml
@@ -138,7 +138,7 @@ let print_sexp_env env =
 let print_fish_env env =
   List.iter (fun (k,v) ->
       match k with
-      | "PATH" | "MANPATH" ->
+      | "PATH" | "MANPATH" | "CDPATH" ->
         let v = OpamStd.String.split_delim v ':' in
         OpamConsole.msg "set -gx %s %s;\n" k
           (OpamStd.List.concat_map " " (Printf.sprintf "%S") v)

diff --git a/src/state/opamState.ml b/src/state/opamState.ml
@@ -1866,7 +1866,7 @@ let source t ~shell ?(interactive_only=false) f =
     | `csh ->
       Printf.sprintf "source %s >& /dev/null || true\n" (file f)
     | `fish ->
-      Printf.sprintf ". %s > /dev/null 2> /dev/null or true\n" (file f)
+      Printf.sprintf "source %s > /dev/null 2> /dev/null or true\n" (file f)
     | _ ->
       Printf.sprintf ". %s > /dev/null 2> /dev/null || true\n" (file f)
   in