# HG changeset patch # User Richard Westhaver # Date 1715719451 14400 # Node ID aeef48e62bc0e20630ba6249d36ca21b8560f2d5 # Parent dde3618a2fcbc539ef39796d1bbf495c43434834 packy cli diff -r dde3618a2fcb -r aeef48e62bc0 lisp/bin/homer.lisp --- a/lisp/bin/homer.lisp Tue May 14 15:14:15 2024 -0400 +++ b/lisp/bin/homer.lisp Tue May 14 16:44:11 2024 -0400 @@ -4,7 +4,7 @@ (defpackage :bin/homer (:nicknames :homer) (:use :cl :std :log :sxp :rdb :skel :packy :cli :obj/id :krypt :vc) - (:export :main :home-config)) + (:export :main :*home-config*)) (in-package :bin/homer) (defvar *user* (sb-posix:getenv "USER")) @@ -167,8 +167,6 @@ (find-files src *home-hidden-paths*))) (error 'file-error :pathname src)))) -(defcmd homer-clean) - (define-cli $cli :name "homer" :version "0.1.0" diff -r dde3618a2fcb -r aeef48e62bc0 lisp/bin/packy.lisp --- a/lisp/bin/packy.lisp Tue May 14 15:14:15 2024 -0400 +++ b/lisp/bin/packy.lisp Tue May 14 16:44:11 2024 -0400 @@ -4,8 +4,32 @@ (in-package :bin/packy) -(defun run ()) +;;; CLI +(defopt pk-help (print-help $cli)) +(defopt pk-version (print-version $cli)) +(defopt pk-log-level (when $val (setq *log-level* :debug))) + +(defcmd pk-show) + +(define-cli $cli + :name "packy" + :version "0.1.0" + :description "user home manager" + :thunk pk-show + :opts (make-opts + (:name "level" :global t :description "set the log level" :thunk pk-log-level) + (:name "help" :global t :description "print help" :thunk pk-help) + (:name "version" :global t :description "print version" :thunk pk-version)) + :cmds (make-cmds + (:name show :thunk pk-show))) + +(defun run () + (let ((*log-level* :info)) + (with-cli (opts cmds args) $cli + (do-cmd $cli) + (debug-opts $cli)))) (defmain () - (run) - (sb-ext:exit :code 0)) + (let ((*print-readably* t)) + (run) + (sb-ext:exit :code 0))) diff -r dde3618a2fcb -r aeef48e62bc0 lisp/web/dash.lisp --- a/lisp/web/dash.lisp Tue May 14 15:14:15 2024 -0400 +++ b/lisp/web/dash.lisp Tue May 14 16:44:11 2024 -0400 @@ -19,9 +19,9 @@ (defun main (&key (output *standard-output*) (port *web-dash-port*)) (let ((*standard-output* output)) (print "starting dash server on ~A" port) - (handler-case (bt:join-thread (find-if (lambda (th) - (search "hunchentoot" (bt:thread-name th))) - (bt:all-threads))) + (handler-case (sb-thread:join-thread (find-if (lambda (th) + (search "hunchentoot" (sb-thread:thread-name th))) + (sb-thread:all-threads))) ;; Catch a user's C-c (#+sbcl sb-sys:interactive-interrupt #+ccl ccl:interrupt-signal-condition