changelog shortlog graph tags branches changeset file revisions annotate raw help

Mercurial > core / lisp/bin/skel.lisp

revision 651: af486e0a40c9
parent 647: 74e563ed4537
child 652: 328e1ff73938
     1.1--- a/lisp/bin/skel.lisp	Fri Sep 13 20:30:55 2024 -0400
     1.2+++ b/lisp/bin/skel.lisp	Sat Sep 14 22:13:06 2024 -0400
     1.3@@ -8,8 +8,7 @@
     1.4    :vc :sb-ext :skel :log :cli/clap/util
     1.5    :dat/sxp #+tools :skel/tools/viz)
     1.6   (:import-from :cli/shell :*shell-input* :*shell-directory*)
     1.7-  (:use :cli/tools/sbcl)
     1.8-  (:export :main))
     1.9+  (:use :cli/tools/sbcl))
    1.10 
    1.11 (in-package :bin/skel)
    1.12 (in-readtable :shell)
    1.13@@ -232,7 +231,7 @@
    1.14 (defcmd skc-new
    1.15   (trace! *args* *opts*))
    1.16 
    1.17-(define-cli *cli*
    1.18+(define-cli *skel-cli*
    1.19   :name "skel"
    1.20   :version #.(format nil "0.1.1:~A" (read-line (sb-ext:process-output (vc:run-hg-command "id" '("-i") :stream))))
    1.21   :description "A hacker's project compiler."
    1.22@@ -340,16 +339,16 @@
    1.23 	  :description "open the sk-shell interpreter"
    1.24           :thunk skc-shell)))
    1.25 
    1.26-(defmain ()
    1.27+(defmain start-skel ()
    1.28   (in-package :sk-user)
    1.29   (let ((*log-level* :info))
    1.30     (in-readtable :shell)
    1.31-    (with-cli (*cli* opts cmds) (cli:args)
    1.32+    (with-cli (*skel-cli* opts cmds) (cli:args)
    1.33       (debug-opts *cli*)
    1.34       (init-skel-vars)
    1.35       (when-let ((project (find-skelfile #P".")))
    1.36         (let ((*default-pathname-defaults* (pathname (directory-namestring project))))
    1.37           (setq *skel-project* (load-skelfile project))
    1.38           (setq *skel-path* (sk-src *skel-project*))
    1.39-          (setq *shell-directory* (sk-src *skel-project*))))
    1.40+          (setq cli/shell:*shell-directory* (sk-src *skel-project*))))
    1.41       (do-cmd *cli*))))