changeset 354: |
aeef48e62bc0 |
parent 353: |
dde3618a2fcb |
child 355: |
09f056e9a789 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Tue, 14 May 2024 16:44:11 -0400 |
files: |
lisp/bin/homer.lisp lisp/bin/packy.lisp lisp/web/dash.lisp |
description: |
packy cli |
1.1--- a/lisp/bin/homer.lisp Tue May 14 15:14:15 2024 -0400
1.2+++ b/lisp/bin/homer.lisp Tue May 14 16:44:11 2024 -0400
1.3@@ -4,7 +4,7 @@
1.4 (defpackage :bin/homer
1.5 (:nicknames :homer)
1.6 (:use :cl :std :log :sxp :rdb :skel :packy :cli :obj/id :krypt :vc)
1.7- (:export :main :home-config))
1.8+ (:export :main :*home-config*))
1.9
1.10 (in-package :bin/homer)
1.11 (defvar *user* (sb-posix:getenv "USER"))
1.12@@ -167,8 +167,6 @@
1.13 (find-files src *home-hidden-paths*)))
1.14 (error 'file-error :pathname src))))
1.15
1.16-(defcmd homer-clean)
1.17-
1.18 (define-cli $cli
1.19 :name "homer"
1.20 :version "0.1.0"
2.1--- a/lisp/bin/packy.lisp Tue May 14 15:14:15 2024 -0400
2.2+++ b/lisp/bin/packy.lisp Tue May 14 16:44:11 2024 -0400
2.3@@ -4,8 +4,32 @@
2.4
2.5 (in-package :bin/packy)
2.6
2.7-(defun run ())
2.8+;;; CLI
2.9+(defopt pk-help (print-help $cli))
2.10+(defopt pk-version (print-version $cli))
2.11+(defopt pk-log-level (when $val (setq *log-level* :debug)))
2.12+
2.13+(defcmd pk-show)
2.14+
2.15+(define-cli $cli
2.16+ :name "packy"
2.17+ :version "0.1.0"
2.18+ :description "user home manager"
2.19+ :thunk pk-show
2.20+ :opts (make-opts
2.21+ (:name "level" :global t :description "set the log level" :thunk pk-log-level)
2.22+ (:name "help" :global t :description "print help" :thunk pk-help)
2.23+ (:name "version" :global t :description "print version" :thunk pk-version))
2.24+ :cmds (make-cmds
2.25+ (:name show :thunk pk-show)))
2.26+
2.27+(defun run ()
2.28+ (let ((*log-level* :info))
2.29+ (with-cli (opts cmds args) $cli
2.30+ (do-cmd $cli)
2.31+ (debug-opts $cli))))
2.32
2.33 (defmain ()
2.34- (run)
2.35- (sb-ext:exit :code 0))
2.36+ (let ((*print-readably* t))
2.37+ (run)
2.38+ (sb-ext:exit :code 0)))
3.1--- a/lisp/web/dash.lisp Tue May 14 15:14:15 2024 -0400
3.2+++ b/lisp/web/dash.lisp Tue May 14 16:44:11 2024 -0400
3.3@@ -19,9 +19,9 @@
3.4 (defun main (&key (output *standard-output*) (port *web-dash-port*))
3.5 (let ((*standard-output* output))
3.6 (print "starting dash server on ~A" port)
3.7- (handler-case (bt:join-thread (find-if (lambda (th)
3.8- (search "hunchentoot" (bt:thread-name th)))
3.9- (bt:all-threads)))
3.10+ (handler-case (sb-thread:join-thread (find-if (lambda (th)
3.11+ (search "hunchentoot" (sb-thread:thread-name th)))
3.12+ (sb-thread:all-threads)))
3.13 ;; Catch a user's C-c
3.14 (#+sbcl sb-sys:interactive-interrupt
3.15 #+ccl ccl:interrupt-signal-condition