From 8672b8bd7af199a468751979fe359b7aa2121071 Mon Sep 17 00:00:00 2001
From: ivaquero <msaintms@outlook.com>
Date: Fri, 5 Apr 2024 18:05:27 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E2=9E=95=20re-add=20sd=20as=20depende?=
 =?UTF-8?q?ncy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md              | 11 ++++++-----
 README_CN.md           | 11 ++++++-----
 defaults/Brewfile.txt  |  4 +++-
 defaults/Scoopfile.txt |  5 +++--
 install.ps1            |  1 +
 install.sh             |  3 +++
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 858f1ca2..81c5958f 100755
--- a/README.md
+++ b/README.md
@@ -75,18 +75,19 @@ Oxidizer is originally designed for **non-administrator** users. It saves your t
 > ☑️ means required in the installation.
 
 - coreutils
-  - [x] Use [uutils-coreutils](https://github.com/uutils/coreutils) instead of `coreutils` (only required on Windows)
   - [x] Use [bat](https://github.com/sharkdp/bat) instead of `cat`
   - [x] Use [lsd](https://github.com/Peltoche/lsd) instead of `ls`
+  - [x] Use [uutils-coreutils](https://github.com/uutils/coreutils) instead of `coreutils`
 - non-coreutils
+  - [x] Use [dust](https://github.com/bootandy/dust) instead of `du`
   - [x] Use [fd](https://github.com/sharkdp/fd) instead of `find`
-  - [x] Use [zoxide](https://github.com/ajeetdsouza/zoxide) instead of `cd` or `z`
   - [x] Use [ripgrep](https://github.com/BurntSushi/ripgrep) instead of `grep`
-  - [ ] Use [dust](https://github.com/bootandy/dust) instead of `du`
+  - [x] Use [sd](https://github.com/chmln/sd) instead of `sed`
+  - [x] Use [tealdeer](https://github.com/dbrgn/tealdeer) instead of `tldr` or `man`
+  - [x] Use [zoxide](https://github.com/ajeetdsouza/zoxide) instead of `cd` or `z`
   - [ ] Use [hyperfine](https://github.com/sharkdp/hyperfine) instead of `time`
   - [ ] Use [procs](https://github.com/dalance/procs) instead of `ps`
   - [ ] Use [starship](https://github.com/starship/starship) instead of `powerline10k` or `ohmyposh`
-  - [ ] Use [tealdeer](https://github.com/dbrgn/tealdeer) instead of `tldr` or `man`
   - [ ] Use [tokei](https://github.com/XAMPPRocky/tokei) instead of `cloc`
   - [ ] Use [tre](https://github.com/dduan/tre) instead of `tree`
 
@@ -94,8 +95,8 @@ Oxidizer is originally designed for **non-administrator** users. It saves your t
 
 ### 2.2. TUI Tools Replacement
 
-- [x] Use [gitui](https://github.com/extrawurst/gitui) instead of `lazygit`
 - [ ] Use [bottom](https://github.com/ClementTsang/bottom) instead of `top` or `htop`
+- [ ] Use [gitui](https://github.com/extrawurst/gitui) instead of `lazygit`
 - [ ] Use [yazi](https://github.com/sxyazi/yazi) instead of `range`
 - [ ] Use [helix](https://github.com/helix-editor/helix) instead of `vim` (Not drop-in)
 - [ ] Use [zellij](https://github.com/zellij-org/zellij) instead of `tmux` (Not supported on Windows)
diff --git a/README_CN.md b/README_CN.md
index 429e0887..116966bc 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -65,18 +65,19 @@ Oxidizer 起初主要为非管理员用户设计，用于快速搭建跨平台
 ☑️ 表示默认安装
 
 - coreutils
-  - [x] 使用 [uutils-coreutils](https://github.com/uutils/coreutils) 替换 `coreutils`（仅 Windows）
   - [x] 使用 [bat](https://github.com/sharkdp/bat) 替换 `cat`
   - [x] 使用 [lsd](https://github.com/Peltoche/lsd) 替换 `ls`
+  - [ ] 使用 [uutils-coreutils](https://github.com/uutils/coreutils) 替换 `coreutils`
 - non-coreutils
+  - [x] 使用 [dust](https://github.com/bootandy/dust) 替换 `du`
   - [x] 使用 [fd](https://github.com/sharkdp/fd) 替换 `find`
-  - [x] 使用 [zoxide](https://github.com/ajeetdsouza/zoxide) 替换 `cd` 和 `z`
   - [x] 使用 [ripgrep](https://github.com/BurntSushi/ripgrep) 替换 `grep`
-  - [ ] 使用 [dust](https://github.com/bootandy/dust) 替换 `du`
+  - [x] 使用 [sd](https://github.com/chmln/sd) 替换 `sed`
+  - [x] 使用 [tealdeer](https://github.com/dbrgn/tealdeer) 替换 `tldr` 和 `man`
+  - [x] 使用 [zoxide](https://github.com/ajeetdsouza/zoxide) 替换 `cd` 和 `z`
   - [ ] 使用 [hyperfine](https://github.com/sharkdp/hyperfine) 替换 `time`
   - [ ] 使用 [procs](https://github.com/dalance/procs) 替换 `ps`
   - [ ] 使用 [starship](https://github.com/starship/starship) 替换 `powerline10k` 和 `ohmyposh`
-  - [ ] 使用 [tealdeer](https://github.com/dbrgn/tealdeer) 替换 `tldr` 和 `man`
   - [ ] 使用 [tokei](https://github.com/XAMPPRocky/tokei) 替换 `cloc`
   - [ ] 使用 [tre](https://github.com/dduan/tre) 替换 `tree`
 
@@ -84,8 +85,8 @@ Oxidizer 起初主要为非管理员用户设计，用于快速搭建跨平台
 
 ### 2.2. TUI 工具替换
 
-- [x] 使用 [gitui](https://github.com/extrawurst/gitui) 替换 `lazygit`
 - [ ] 使用 [bottom](https://github.com/ClementTsang/bottom) 替换 `top` 和 `htop`
+- [ ] 使用 [gitui](https://github.com/extrawurst/gitui) 替换 `lazygit`
 - [ ] 使用 [yazi](https://github.com/sxyazi/yazi) 替换 `range`
 - [ ] 使用 [helix](https://github.com/helix-editor/helix) 替换 `vim` （非平替）
 - [ ] 使用 [zellij](https://github.com/zellij-org/zellij) 替换 `tmux`（目前不支持 Windows）
diff --git a/defaults/Brewfile.txt b/defaults/Brewfile.txt
index 7026e36e..37420744 100644
--- a/defaults/Brewfile.txt
+++ b/defaults/Brewfile.txt
@@ -1,7 +1,9 @@
 bat
+dust
 fd
-gitui
 lsd
 ouch
 ripgrep
+sd
+tealdeer
 zoxide
diff --git a/defaults/Scoopfile.txt b/defaults/Scoopfile.txt
index 46d9ff57..28f691bf 100755
--- a/defaults/Scoopfile.txt
+++ b/defaults/Scoopfile.txt
@@ -1,9 +1,10 @@
 bat
+dust
 fd
-gitui
 lsd
 ouch
 ripgrep
+sd
+tealdeer
 zoxide
-sed
 sudo
diff --git a/install.ps1 b/install.ps1
index d93e3b8b..4d425753 100755
--- a/install.ps1
+++ b/install.ps1
@@ -41,6 +41,7 @@ $pkgs = cat "$env:OXIDIZER\defaults\Scoopfile.txt"
 ForEach ( $pkg in $pkgs ) {
     Switch ($pkg) {
         ripgrep { $cmd = "rg" }
+        tealdeer { $cmd = "tldr" }
         zoxide { $cmd = "z" }
         Default { $cmd = $pkg }
     }
diff --git a/install.sh b/install.sh
index 7c53c9dd..4cf7b4a1 100644
--- a/install.sh
+++ b/install.sh
@@ -50,6 +50,9 @@ cat "${OXIDIZER}"/defaults/Brewfile.txt | while read -r pkg; do
     ripgrep)
         cmd='rg'
         ;;
+    tealdeer)
+        cmd='tldr'
+        ;;
     zoxide)
         cmd='z'
         ;;