aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/interp/daase.lisp2
-rw-r--r--src/interp/sys-driver.boot20
2 files changed, 15 insertions, 7 deletions
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index cc4f4268..b2b8f8c7 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -1355,7 +1355,7 @@
;;(defun DaaseName (name erase?)
;; (let (daase filename)
;; (declare (special $spadroot))
-;; (if (setq daase (|getEnv| "DAASE"))
+;; (if (setq daase (|systemDatabaseDirectory|))
;; (progn
;; (setq filename (concatenate 'string daase "/algebra/" name))
;; (format t " Using local database ~a.." filename))
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 55843345..4a97d76e 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -75,19 +75,27 @@ AxiomCore::%sysInit() ==
SETQ(COMPILER::_*SUPPRESS_-COMPILER_-NOTES_*,true)
)endif
+--%
+
+++ Returns the directory name as specified through option name `opt'.
+directoryFromCommandLine opt ==
+ dir := ASSOC(Option opt, %systemOptions()) =>
+ ensureTrailingSlash rest dir
+ nil
++ Returns the system algebra directory, as specified on command
++ line. nil, otherwise.
systemAlgebraDirectory() ==
- dir := ASSOC(Option '"sysalg", %systemOptions()) =>
- ensureTrailingSlash rest dir
- nil
+ directoryFromCommandLine '"sysalg"
++ Returns a path to the directory containing algebra bootstsrap files.
algebraBootstrapDir() ==
- dir := ASSOC(Option '"strap",%systemOptions()) =>
- ensureTrailingSlash rest dir
- nil
+ directoryFromCommandLine '"strap"
+
+++ Returns a path to the directory containing databases, as specified
+++ on command line. Nil otherwise.
+systemDatabaseDirectory() ==
+ directoryFromCommandLine '"sysdb"
++ Load list of exposed categories, domains, and packages.
++ User-specified list takes precedence over system wide list.