fix: remove stale ASDF push and apt spam from CLI script
Some checks failed
Deploy (Gitea) / deploy (push) Failing after 2s
Some checks failed
Deploy (Gitea) / deploy (push) Failing after 2s
- Remove push of deleted XDG dir from TUI/daemon subcommands (quicklisp local-projects symlink covers it) - check_dependencies now only checks sbcl/git/curl/emacs (not nc/socat), and runs apt-get update only when packages are actually missing
This commit is contained in:
19
passepartout
19
passepartout
@@ -52,7 +52,7 @@ distro_install() {
|
||||
# --- DEPENDENCY CHECK ---
|
||||
check_dependencies() {
|
||||
local missing=()
|
||||
for dep in sbcl git curl socat nc; do
|
||||
for dep in sbcl git curl; do
|
||||
if ! command_exists "$dep"; then missing+=("$dep"); fi
|
||||
done
|
||||
if ! command_exists emacs; then missing+=("emacs-nox"); fi
|
||||
@@ -61,14 +61,11 @@ check_dependencies() {
|
||||
local distro=$(detect_distro)
|
||||
case "$distro" in
|
||||
debian)
|
||||
distro_install "${missing[@]}" libssl-dev libncurses-dev libffi-dev zlib1g-dev libsqlite3-dev 2>/dev/null || true
|
||||
if ! command_exists rlwrap; then distro_install rlwrap 2>/dev/null || true; fi
|
||||
if ! command_exists nc; then distro_install netcat-openbsd 2>/dev/null || true; fi
|
||||
sudo apt-get update -qq 2>/dev/null || true
|
||||
distro_install "${missing[@]}" 2>/dev/null || true
|
||||
;;
|
||||
fedora)
|
||||
distro_install "${missing[@]}" openssl-devel ncurses-devel libffi-devel zlib-devel sqlite-devel 2>/dev/null || true
|
||||
if ! command_exists rlwrap; then distro_install rlwrap 2>/dev/null || true; fi
|
||||
if ! command_exists nc; then distro_install nmap-ncat 2>/dev/null || true; fi
|
||||
distro_install "${missing[@]}" 2>/dev/null || true
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -383,7 +380,6 @@ case "$COMMAND" in
|
||||
echo "Starting daemon (data dir: $PASSEPARTOUT_DATA_DIR)..."
|
||||
nohup sbcl --non-interactive \
|
||||
--eval '(load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname)))' \
|
||||
--eval "(push (truename \"$PASSEPARTOUT_DATA_DIR/\") asdf:*central-registry*)" \
|
||||
--eval "(ql:quickload :passepartout)" \
|
||||
--eval "(load (format nil \"~alisp/system-model-router.lisp\" (truename \"$PASSEPARTOUT_DATA_DIR/\")))" \
|
||||
--eval "(load (format nil \"~alisp/system-embedding-gateway.lisp\" (truename \"$PASSEPARTOUT_DATA_DIR/\")))" \
|
||||
@@ -404,13 +400,10 @@ case "$COMMAND" in
|
||||
echo "Starting daemon first..."
|
||||
$0 daemon
|
||||
fi
|
||||
sbcl \
|
||||
exec sbcl \
|
||||
--eval '(load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname)))' \
|
||||
--eval "(push (truename \"$PASSEPARTOUT_DATA_DIR/\") asdf:*central-registry*)" \
|
||||
--eval '(ql:quickload :passepartout/tui)' \
|
||||
--eval '(passepartout.gateway-tui:main)' || {
|
||||
echo "TUI error. Run 'passepartout doctor --fix'"; exit 1
|
||||
}
|
||||
--eval '(passepartout.gateway-tui:main)'
|
||||
;;
|
||||
gateway)
|
||||
SUBCMD=$1; PLATFORM=$2; TOKEN=$3
|
||||
|
||||
Reference in New Issue
Block a user