Skip to content

Commit 9e4324c

Browse files
committed
Reuse GobFpath.cwd and GobSys.exe_dir
1 parent 5c83c18 commit 9e4324c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/config/gobConfig.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,7 @@ struct
404404

405405
(** Merge configurations form a file with current. *)
406406
let merge_file fn =
407-
let cwd = Fpath.v (Sys.getcwd ()) in
408-
let config_dirs = cwd :: Fpath.(parent (v Sys.executable_name)) :: Goblint_sites.conf in
407+
let config_dirs = GobFpath.cwd () :: GobSys.exe_dir :: Goblint_sites.conf in
409408
let file = List.find_map_opt (fun custom_include_dir ->
410409
let path = Fpath.append custom_include_dir fn in
411410
if Sys.file_exists (Fpath.to_string path) then

src/framework/xsltResultOutput.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ struct
288288
Timing.wrap "graphviz" (ProcessPool.run ~jobs:(GobConfig.jobs ())) tasks
289289

290290
let copy_resources ~result_dir =
291-
let xslt_dirs = Fpath.(parent (v Sys.executable_name) / "xslt") :: Goblint_sites.xslt in
291+
let xslt_dirs = Fpath.(GobSys.exe_dir / "xslt") :: Goblint_sites.xslt in
292292
let xslt_dir = List.find_opt (fun dir ->
293293
let dir_str = Fpath.to_string dir in
294294
Sys.file_exists dir_str && Sys.is_directory dir_str

0 commit comments

Comments
 (0)