21c21
< ;; Use `add-contrib-dir' to add the location stumpwm searches for modules.
---
> ;; Use `set-contrib-dir' to set the location stumpwm searches for modules.
29,30c29,30
< 	  *contrib-dirs*
< 	  add-contrib-dir
---
> 	  *contrib-dir*
> 	  set-contrib-dir
38,39c38
< (defvar *contrib-dirs*
<   (list
---
> (defvar *contrib-dir*
42c41
<                                                   '(:relative "contrib"))))
---
>                                                   '(:relative "contrib")))
45c44
< (defcommand add-contrib-dir (dir) ((:string "Directory: "))
---
> (defcommand set-contrib-dir (dir) ((:string "Directory: "))
47,48c46
<     (let ((module-string (module-string-as-directory dir)))
<       (push module-string *contrib-dirs*)))
---
>   (setf *contrib-dir* (module-string-as-directory dir)))
56,64c54,57
<   (let ((mod-list) '())
<     (dolist (i *contrib-dirs*)
<       (dolist (element
<                (mapcar 'pathname-name
<                        (directory (make-pathname :defaults i
<                                                  :name :wild
<                                                  :type "lisp"))))
<       (push element mod-list)))
<     (remove-duplicates mod-list :test #'equal)))
---
>   (mapcar 'pathname-name
>           (directory (make-pathname :defaults *contrib-dir*
> 				    :name :wild
> 				    :type "lisp"))))
67,77c60,62
<   "Find module from list avaliable modules FIXME: test"
<   (labels
<    ((module-p (dir-list name)
<               (cond
<                ((null dir-list) nil)
<                ((probe-file (make-pathname :defaults (car dir-list) :name name :type "lisp"))
<                 (make-pathname :defaults (pathname (princ-to-string (car dir-list)))
< 			       :name name
< 			       :type "lisp"))
<                (t (module-p (cdr dir-list) name)))))
<    (module-p (reverse *contrib-dirs*) name)))
---
>   (probe-file (make-pathname :defaults *contrib-dir*
>                              :name name
>                              :type "lisp")))
86a72
> 
25c25
< #-ecl (stumpwm:add-contrib-dir "@CONTRIB_DIR@")
---
> #-ecl (stumpwm:set-contrib-dir "@CONTRIB_DIR@")
49c49
<                                   (stumpwm:add-contrib-dir "@CONTRIB_DIR@")
---
>                                   (stumpwm:set-contrib-dir "@CONTRIB_DIR@")