From 57a0ef4efdb0620a3e64703d9c4cbc4fd150c39b Mon Sep 17 00:00:00 2001 From: cage Date: Fri, 17 Jan 2025 16:19:58 +0100 Subject: [PATCH] - prevented infinite loop when invoking restart 'resources-utils:create-empty-in-home'. --- src/resources-utils.lisp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/resources-utils.lisp b/src/resources-utils.lisp index efd9aaa..e4148f9 100644 --- a/src/resources-utils.lisp +++ b/src/resources-utils.lisp @@ -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)