From 0724b5a07bdb8234d1653bbf19d1770d53a3d8e6 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Sat, 27 Aug 2022 13:07:32 +0200
Subject: [PATCH] Move /ini/lisp to /lib/lisp (#398)

---
 doc/lisp.md                    | 2 +-
 dsk/{ini => lib}/lisp/core.lsp | 0
 dsk/tmp/lisp/factorial.lsp     | 2 +-
 dsk/tmp/lisp/fibonacci.lsp     | 2 +-
 src/usr/install.rs             | 6 +++---
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename dsk/{ini => lib}/lisp/core.lsp (100%)

diff --git a/doc/lisp.md b/doc/lisp.md
index 51c748b..4daae47 100644
--- a/doc/lisp.md
+++ b/doc/lisp.md
@@ -75,7 +75,7 @@ And it can execute a file. For example a file located in `/tmp/lisp/fibonacci.ls
 with the following content:
 
 ```lisp
-(load "/ini/lisp/core.lsp")
+(load "/lib/lisp/core.lsp")
 
 (defn fib (n)
   (cond
diff --git a/dsk/ini/lisp/core.lsp b/dsk/lib/lisp/core.lsp
similarity index 100%
rename from dsk/ini/lisp/core.lsp
rename to dsk/lib/lisp/core.lsp
diff --git a/dsk/tmp/lisp/factorial.lsp b/dsk/tmp/lisp/factorial.lsp
index 8f0e265..42c5087 100644
--- a/dsk/tmp/lisp/factorial.lsp
+++ b/dsk/tmp/lisp/factorial.lsp
@@ -1,4 +1,4 @@
-(load "/ini/lisp/core.lsp")
+(load "/lib/lisp/core.lsp")
 
 (defn fact-acc (n acc)
   (cond
diff --git a/dsk/tmp/lisp/fibonacci.lsp b/dsk/tmp/lisp/fibonacci.lsp
index 67ce451..ecb28fa 100644
--- a/dsk/tmp/lisp/fibonacci.lsp
+++ b/dsk/tmp/lisp/fibonacci.lsp
@@ -1,4 +1,4 @@
-(load "/ini/lisp/core.lsp")
+(load "/lib/lisp/core.lsp")
 
 (defn fib (n)
   (cond
diff --git a/src/usr/install.rs b/src/usr/install.rs
index b43192e..50e1c31 100644
--- a/src/usr/install.rs
+++ b/src/usr/install.rs
@@ -41,14 +41,14 @@ pub fn copy_files(verbose: bool) {
     copy_file("/ini/shell.sh", include_bytes!("../../dsk/ini/shell.sh"), verbose);
     copy_file("/ini/version.txt", include_bytes!("../../dsk/ini/version.txt"), verbose);
 
-    create_dir("/ini/lisp", verbose);
-    copy_file("/ini/lisp/core.lsp", include_bytes!("../../dsk/ini/lisp/core.lsp"), verbose);
-
     create_dir("/ini/fonts", verbose);
     copy_file("/ini/fonts/lat15-terminus-8x16.psf", include_bytes!("../../dsk/ini/fonts/lat15-terminus-8x16.psf"), verbose);
     copy_file("/ini/fonts/zap-light-8x16.psf", include_bytes!("../../dsk/ini/fonts/zap-light-8x16.psf"), verbose);
     copy_file("/ini/fonts/zap-vga-8x16.psf", include_bytes!("../../dsk/ini/fonts/zap-vga-8x16.psf"), verbose);
 
+    create_dir("/lib/lisp", verbose);
+    copy_file("/lib/lisp/core.lsp", include_bytes!("../../dsk/lib/lisp/core.lsp"), verbose);
+
     copy_file("/tmp/alice.txt", include_bytes!("../../dsk/tmp/alice.txt"), verbose);
     copy_file("/tmp/machines.txt", include_bytes!("../../dsk/tmp/machines.txt"), verbose);