1
0
mirror of https://codeberg.org/cage/tinmop/ synced 2025-02-23 09:07:37 +01:00

- prevented infinite loop when invoking restart 'resources-utils:create-empty-in-home'.

This commit is contained in:
cage 2025-01-17 16:19:58 +01:00
parent 8b1a10b866
commit 57a0ef4efd

View File

@ -67,23 +67,23 @@
(get-resource-file system-dir home-dir path))))))))
(defun get-resource-dir (system-dir home-dir path)
(let ((system-dir (fs:cat-parent-dir system-dir path))
(home-dir (fs:cat-parent-dir home-dir path)))
(let ((actual-system-dir (filesystem-utils:cat-parent-dir system-dir path))
(actual-home-dir (filesystem-utils:cat-parent-dir home-dir path)))
(cond
((fs:dirp home-dir)
home-dir)
((fs:dirp system-dir)
system-dir)
((filesystem-utils:dirp actual-home-dir)
actual-home-dir)
((filesystem-utils:dirp actual-system-dir)
actual-system-dir)
(t
(let ((msg (_ "Cannot find ~s in either ~s or ~s")))
(restart-case
(error (format nil msg path system-dir home-dir))
(return-home-dirname ()
home-dir)
actual-home-dir)
(return-system-dirname ()
system-dir)
actual-system-dir)
(create-empty-in-home ()
(fs:make-directory home-dir)
(filesystem-utils:make-directory actual-home-dir)
(get-resource-dir system-dir home-dir path))))))))
(defun get-config-file (path)