From 85ea92459524657466f3f4ed418691ec819e1862 Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Sun, 22 Sep 2019 14:23:50 -0700 Subject: [PATCH 1/2] cli: fix wrong argument being sent to doom-upgrade In 84837fa0d, a new argument was added before the timeout arg which broken this flag. --- core/cli/upgrade.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/cli/upgrade.el b/core/cli/upgrade.el index 56304476e..5dc928c9e 100644 --- a/core/cli/upgrade.el +++ b/core/cli/upgrade.el @@ -16,6 +16,8 @@ following shell commands: (member "--force" args))) (doom-packages-update doom-auto-accept + (when-let (threads (cadr (member "--threads" args))) + (string-to-number threads)) (when-let (timeout (cadr (or (member "--timeout" args) (member "-t" args)))) (string-to-number timeout))) From 686e020287bfe848dfb4c7e8a01424cb367d1b21 Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Sun, 22 Sep 2019 14:34:40 -0700 Subject: [PATCH 2/2] cli: add documentation string about new flags --- core/cli/upgrade.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/cli/upgrade.el b/core/cli/upgrade.el index 5dc928c9e..893012f41 100644 --- a/core/cli/upgrade.el +++ b/core/cli/upgrade.el @@ -10,7 +10,11 @@ following shell commands: git pull --rebase bin/doom clean bin/doom refresh - bin/doom update" + bin/doom update + +Switches: + -t/--timeout TTL Seconds until a thread is timed out (default: 45) + --threads N How many threads to use (default: 8)" (and (doom-upgrade doom-auto-accept (or (member "-f" args) (member "--force" args)))