diff --git a/README.md b/README.md index a1b4aa8..882b4ce 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,9 @@ ## 快速开始 ```bash -# 1. 克隆仓库 +# 1. 克隆仓库(SSH 或 HTTPS) git clone git@git-ssh.furtherverse.com:imbytecat/archlinux-wsl-init.git +# 或: git clone https://git-ssh.furtherverse.com/imbytecat/archlinux-wsl-init.git cd archlinux-wsl-init # 2. 运行 bootstrap(安装 yay 和 dcli) diff --git a/arch-config/files/home/.zshrc b/arch-config/files/home/.zshrc index c9393fd..7db0a13 100644 --- a/arch-config/files/home/.zshrc +++ b/arch-config/files/home/.zshrc @@ -5,10 +5,14 @@ plugins=(git zsh-autosuggestions zsh-syntax-highlighting) source $ZSH/oh-my-zsh.sh # mise -eval "$(mise activate zsh)" +if command -v mise &> /dev/null; then + eval "$(mise activate zsh)" +fi # zoxide -eval "$(zoxide init zsh)" +if command -v zoxide &> /dev/null; then + eval "$(zoxide init zsh)" +fi # Aliases alias ls='ls --color=auto' diff --git a/bootstrap.sh b/bootstrap.sh index ba71fcd..2ec3006 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,14 +1,15 @@ #!/bin/bash -set -e +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" echo "==> 安装 yay..." if ! command -v yay &> /dev/null; then sudo pacman -S --needed --noconfirm base-devel git - cd /tmp - git clone https://aur.archlinux.org/yay.git - cd yay + rm -rf /tmp/yay + git clone https://aur.archlinux.org/yay.git /tmp/yay + cd /tmp/yay makepkg -si --noconfirm - cd ~ fi echo "==> 安装 dcli..." @@ -16,7 +17,7 @@ yay -S --needed --noconfirm dcli-arch-git echo "==> 复制配置..." mkdir -p ~/.config/arch-config -cp -r ./arch-config/* ~/.config/arch-config/ +cp -r "$SCRIPT_DIR/arch-config"/* ~/.config/arch-config/ echo "" echo "✓ Bootstrap 完成!"