From 26710df6c6ab6c261876c7029cec8d76596a05dd Mon Sep 17 00:00:00 2001 From: unknowndevQwQ Date: Thu, 13 Oct 2022 16:02:08 +0800 Subject: [PATCH 1/4] feat: add doas support Some people may have some reason to drop sudo and switch to doas --- install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index bbecb4d598f53..2c8336a4e69bf 100755 --- a/install.sh +++ b/install.sh @@ -531,6 +531,8 @@ sh_c() { sudo_sh_c() { if [ "$(id -u)" = 0 ]; then sh_c "$@" + elif command_exists doas; then + sh_c "doas $*" elif command_exists sudo; then sh_c "sudo $*" elif command_exists su; then @@ -539,7 +541,7 @@ sudo_sh_c() { echoh echoerr "This script needs to run the following command as root." echoerr " $*" - echoerr "Please install sudo or su." + echoerr "Please install doas, sudo or su." exit 1 fi } From 058fb1f9d3007fd74ff83653e621b7f610fe3093 Mon Sep 17 00:00:00 2001 From: unknowndevQwQ Date: Fri, 14 Oct 2022 01:14:38 +0800 Subject: [PATCH 2/4] chore: doas at the end Just because it is relatively cold :-( Co-authored-by: Kyle Carberry --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 2c8336a4e69bf..bac333cf938c4 100755 --- a/install.sh +++ b/install.sh @@ -541,7 +541,7 @@ sudo_sh_c() { echoh echoerr "This script needs to run the following command as root." echoerr " $*" - echoerr "Please install doas, sudo or su." + echoerr "Please install sudo, su, or doas." exit 1 fi } From ef9c27887ab69dff6d1f2589ff7f858d711d2c15 Mon Sep 17 00:00:00 2001 From: unknowndevQwQ Date: Fri, 14 Oct 2022 08:50:55 +0800 Subject: [PATCH 3/4] chore(CI): add doas to pass CI --- .github/workflows/typos.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml index 90b0ea1cc9348..d10d53c9c1734 100644 --- a/.github/workflows/typos.toml +++ b/.github/workflows/typos.toml @@ -5,6 +5,8 @@ IST = "IST" MacOS = "macOS" [default.extend-words] +# do as sudo replacement +doas=doas [files] extend-exclude = [ From 0228e7ecb07aabb119719e59fa82c506999f1889 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 16 Oct 2022 02:08:19 +0000 Subject: [PATCH 4/4] fix syntax error --- .github/workflows/typos.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml index d10d53c9c1734..f3d22513ac40a 100644 --- a/.github/workflows/typos.toml +++ b/.github/workflows/typos.toml @@ -6,7 +6,7 @@ MacOS = "macOS" [default.extend-words] # do as sudo replacement -doas=doas +doas = "doas" [files] extend-exclude = [