Keep track of pack providing directories by updating file_search_path/2.

SWI-Prolog · Jan 12, 2024 · 47c034b · 47c034b
1 parent 70b3191
commit 47c034b
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/boot/packs.pl b/boot/packs.pl
@@ -40,16 +40,14 @@
             attach_packs/2,                     % +Dir, +Options
             '$pack_detach'/2,                   % +Name, -Dir
             '$pack_attach'/1,                   % +Dir
-            '$pack_attach'/2,                   % +Dir, +Options
-            '$packs_from'/1                     % ?Dir
+            '$pack_attach'/2                    % +Dir, +Options
           ]).
 
 :- multifile user:file_search_path/2.
 :- dynamic user:file_search_path/2.
 
 :- dynamic
     pack_dir/3,                             % Pack, Type, Dir
-    packs_from/1,                           % Dir
     pack/2.                                 % Pack, BaseDir
 
 user:file_search_path(pack, app_data(pack)).
@@ -93,9 +91,6 @@
     ;   '$domain_error'(pack, Dir)
     ).
 
-'$packs_from'(Dir) :-
-    packs_from(Dir).
-
 %!  attach_packs
 %
 %   Attach  packages  from  all  package    directories.  If  there  are
@@ -174,7 +169,7 @@
     (   '$option'(replace(true), Options)
     ->  forall(pack(Name, PackDir),
                '$pack_detach'(Name, PackDir)),
-        retractall(packs_from(_))
+        retractall(user:file_search_path(pack, _))
     ;   true
     ),
     register_packs_from(Dir),
@@ -190,11 +185,10 @@
 attach_packs(_, _).
 
 register_packs_from(Dir) :-
-    packs_from(Dir),
-    !.
-register_packs_from(Dir) :-
-    asserta(packs_from(Dir)),
-    !.
+    (   user:file_search_path(pack, Dir)
+    ->  true
+    ;   asserta(user:file_search_path(pack, Dir))
+    ).
 
 attach_packages([], _, _).
 attach_packages([H|T], Dir, Options) :-