diff --git a/lib/file_store.ml b/lib/file_store.ml index 354cd95..707c970 100644 --- a/lib/file_store.ml +++ b/lib/file_store.ml @@ -3,12 +3,10 @@ type item_t = t list type record_t = Text.t * item_t let extension = ".txt" -let def_dir () = - let share = Sys.getenv "HOME" ^ "/.local/share/texts/" in - try Sys.getenv "txtdir" with Not_found -> - match Sys.is_directory share with - | true -> share - | false | exception (Sys_error _) -> "." +let def_dir () = try Sys.getenv "txtdir" with Not_found -> + let share = Filename.concat (Sys.getenv "HOME") ".local/share/texts/" in + match Sys.is_directory share with true -> share + | false | exception (Sys_error _) -> "." let to_string f = let ic = open_in f in diff --git a/lib/peers.ml b/lib/peers.ml index 44f1389..513dc8c 100644 --- a/lib/peers.ml +++ b/lib/peers.ml @@ -1,4 +1,4 @@ -let text_dir = Filename.concat (Sys.getenv "HOME") ".local/share/texts" +let text_dir = Filename.concat (File_store.def_dir ()) "peers" let fold fn init = match Sys.readdir text_dir with | exception (Sys_error msg) -> prerr_endline msg