From 6fab798946e640235e38646341eded9c09cd2657 Mon Sep 17 00:00:00 2001 From: hanruo <552455797@qq.com> Date: Sat, 23 May 2026 22:12:23 +0800 Subject: [PATCH] fix --- src/lib/tasks.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/lib/tasks.js b/src/lib/tasks.js index 8f62556..6d13511 100644 --- a/src/lib/tasks.js +++ b/src/lib/tasks.js @@ -47,9 +47,9 @@ function zshInstallPlan() { const syntaxHighlightingDir = path.join(customDir, "plugins", "zsh-syntax-highlighting"); const steps = [ - run("apt update", "sudo", ["apt", "update"]), - run("apt upgrade", "sudo", ["apt", "upgrade", "-y"]), - run("install zsh & friends", "sudo", ["apt", "install", "zsh", "git", "curl", "wget", "-y"]), + run("apt update", "sudo", aptArgs("update")), + run("apt upgrade", "sudo", aptArgs("upgrade", "-y")), + run("install zsh & friends", "sudo", aptArgs("install", "zsh", "git", "curl", "wget", "-y")), run("git credential helper = store", "git", ["config", "--global", "credential.helper", "store"]), run("change shell to zsh", "sudo", ["chsh", "-s", "/bin/zsh", os.userInfo().username]), run("install oh-my-zsh", "sh", ["-c", OH_MY_ZSH_COMMAND]), @@ -125,8 +125,8 @@ function sshInstallPlan() { return { title: "Install OpenSSH server", steps: [ - run("apt update", "sudo", ["apt", "update"]), - run("install openssh-server", "sudo", ["apt", "install", "openssh-server", "-y"]), + run("apt update", "sudo", aptArgs("update")), + run("install openssh-server", "sudo", aptArgs("install", "openssh-server", "-y")), run("enable + start ssh", "sudo", ["systemctl", "enable", "--now", "ssh"]), ], }; @@ -351,6 +351,18 @@ function requireToken(value) { return token; } +function aptArgs(...args) { + return [ + "DEBIAN_FRONTEND=noninteractive", + "NEEDRESTART_MODE=a", + "NEEDRESTART_SUSPEND=1", + "apt-get", + "-o", "Dpkg::Options::=--force-confold", + "-o", "Dpkg::Options::=--force-confdef", + ...args, + ]; +} + function run(label, command, args) { return { kind: "run", label, command, args }; }