opam init --dot-profile=FILE should pick as default config file giv…

…en the one given by the user.

src/client/opamClient.ml

@@ -651,16 +651,16 @@ module API = struct
             wish_remove  = [];
             wish_upgrade = compiler_packages } in
 
-      let dot_profile = Some dot_profile in
+      let dot_profile_o = Some dot_profile in
       begin match update_config with
-        | Some `ask  -> OpamState.update_setup_interactive t ~global:true
+        | Some `ask  -> OpamState.update_setup_interactive t ~global:true ~dot_profile
         | Some (`sh|`zsh as shell) ->
           let complete = Some shell in
           let global = Some { complete; switch_eval = true } in
-          OpamState.update_setup t ~dot_profile ~ocamlinit:true ~global
+          OpamState.update_setup t ~dot_profile:dot_profile_o ~ocamlinit:true ~global
         | None       -> ()
       end;
-      OpamState.print_env_warning t ~eval:false ~dot_profile
+      OpamState.print_env_warning t ~eval:false ~dot_profile:dot_profile_o
 
     with e ->
       if not !OpamGlobals.debug then

src/client/opamState.ml

@@ -1083,7 +1083,7 @@ let display_setup t ~dot_profile =
   OpamGlobals.msg "Global configuration:\n";
   List.iter print global_setup
 
-let update_setup_interactive t ~global =
+let update_setup_interactive t ~global ~dot_profile =
   let max = if not global then 2 else 4 in
   let current = ref 1 in
   let stats () =
@@ -1094,16 +1094,20 @@ let update_setup_interactive t ~global =
   if confirm "Do you want to update your configuration to use OPAM ?" then (
     let dot_profile =
       let file =
-        match read "%sDo you want to update your shell configuration file ? [default: ~/.profile]" (stats ()) with
+        match
+          read "%sDo you want to update your shell configuration file ? [default: %s]"
+            (OpamFilename.prettify dot_profile)
+            (stats ())
+        with
         | Some "y"
         | Some "Y"
-        | None   -> Filename.concat (OpamMisc.getenv "HOME") ".profile"
-        | Some s -> s in
-      if not (Sys.file_exists file)
-      && not (confirm "  %S does not exist, do you want to create it ?" file) then
+        | None   -> dot_profile
+        | Some s -> OpamFilename.of_string s in
+      if not (OpamFilename.exists file)
+      && not (confirm "  %S does not exist, do you want to create it ?" (OpamFilename.to_string file)) then
         None
       else
-        Some (OpamFilename.of_string file) in
+        Some file in
     let ocamlinit =
       confirm "%sDo you want to update your ~/.ocamlinit ?" (stats ()) in
     let complete =

src/client/opamState.mli

@@ -114,7 +114,7 @@ val print_env_warning: state -> eval:bool -> dot_profile:filename option -> unit
 (** {2 Initialisation} *)
 
 (** Update the global and user configuration by asking some questions. *)
-val update_setup_interactive: state -> global:bool -> unit
+val update_setup_interactive: state -> global:bool -> dot_profile:filename -> unit
 
 (** Display the global and user configuration for OPAM. *)
 val display_setup: state -> dot_profile:filename -> unit