File 1675-debugger-Fix-debugger-settings-to-use-XDG.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1675-debugger-Fix-debugger-settings-to-use-XDG.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Currently displaying revision 57cf7c87cb80e2aaaf3f20327bf57529 , Show latest

From c594d97d03406936c633a049efa6ae40e6bdb763 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 28 Oct 2021 08:57:27 +0200
Subject: [PATCH 5/7] debugger: Fix debugger settings to use XDG

---
 lib/debugger/src/dbg_wx_settings.erl | 57 +++++++++++++++-------------
 lib/observer/src/observer_wx.erl     |  2 +-
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/lib/debugger/src/dbg_wx_settings.erl b/lib/debugger/src/dbg_wx_settings.erl
index 3a355f18a9..a70bfc87e3 100644
--- a/lib/debugger/src/dbg_wx_settings.erl
+++ b/lib/debugger/src/dbg_wx_settings.erl
@@ -80,30 +80,35 @@ default_settings_dir(Win) ->
     case filelib:is_dir(DefDir) of
 	true -> DefDir;
 	false ->
-	    {ok, CWD} = file:get_cwd(),
-	    
-	    Msg = ["Default directory ", DefDir, " does not exist. ",
-		   "Click OK to create it or ",
-		   "Cancel to use other directory."],
-	    case dbg_wx_win:confirm(Win, Msg) of
-		ok ->
-		    ToolsDir = filename:dirname(DefDir),
-		    case filelib:is_dir(ToolsDir) of
-			true ->
-			    case file:make_dir(DefDir) of
-				ok -> DefDir;
-				_Error -> CWD
-			    end;
-			false ->
-			    case file:make_dir(ToolsDir) of
-				ok ->
-				    case file:make_dir(DefDir) of
-					ok -> DefDir;
-					_Error -> CWD
-				    end;
-				_Error -> CWD
-			    end
-		    end;
-		cancel -> CWD
-	    end
+            XDGDir = filename:join(filename:basedir(user_config,"erlang"),"debugger"),
+            case filelib:is_dir(XDGDir) of
+                true -> XDGDir;
+                false ->
+                    {ok, CWD} = file:get_cwd(),
+
+                    Msg = ["Default directory ", XDGDir, " does not exist. ",
+                           "Click OK to create it or ",
+                           "Cancel to use other directory."],
+                    case dbg_wx_win:confirm(Win, Msg) of
+                        ok ->
+                            ToolsDir = filename:dirname(XDGDir),
+                            case filelib:is_dir(ToolsDir) of
+                                true ->
+                                    case file:make_dir(XDGDir) of
+                                        ok -> XDGDir;
+                                        _Error -> CWD
+                                    end;
+                                false ->
+                                    case file:make_dir(ToolsDir) of
+                                        ok ->
+                                            case file:make_dir(XDGDir) of
+                                                ok -> XDGDir;
+                                                _Error -> CWD
+                                            end;
+                                        _Error -> CWD
+                                    end
+                            end;
+                        cancel -> CWD
+                    end
+            end
     end.
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index eb7d802876..22243aa3e1 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -661,7 +661,7 @@ create_connect_dialog(connect, #state{frame = Frame}) ->
     {ok,[[HomeDir]]} = init:get_argument(home),
     XDGHome = filename:basedir(user_config,"erlang"),
     DefaultCookie =
-        case file:path_open([HomeDir,XDGHome], ".erlang.cookie", read) of
+        case file:path_open([HomeDir,XDGHome], ".erlang.cookie", [read]) of
             {ok, File, _} ->
                 {ok, #file_info{ size = Sz }} = file:read_file_info(File),
                 {ok, Data} = file:read(File, Sz),
-- 
2.31.1

Places

File 1675-debugger-Fix-debugger-settings-to-use-XDG.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Places