easy-command 2.0.1 → 2.0.2

package/README.md

@@ -34,18 +34,20 @@ exec zsh -l
 
 ```bash
 # Preview installation without changing your machine
-easy-command --dry-run
+npx easy-command --dry-run
 
 # Check Shell, dependencies, managed repositories, and .zshrc configuration
-easy-command doctor
+npx easy-command doctor
 
 # Restore missing managed files and configuration
-easy-command repair -y
+npx easy-command repair -y
 
 # Safely update Oh My Zsh and managed plugins
-easy-command update -y
+npx easy-command update -y
 ```
 
+`npx` runs the command without a global npm installation. If you prefer the shorter `easy-command` command, install it globally with `npm install -g easy-command`.
+
 ## What you get
 
 - A clean `agnoster` prompt with your user, path, Git branch, and working-tree status.
@@ -119,13 +121,13 @@ bash install.sh -y
 For production, pin a release tag instead of running `main` directly:
 
 ```bash
-npx easy-command@2.0.1 -y
+npx easy-command@2.0.2 -y
 ```
 
 Or, without npm:
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.1/install.sh | bash -s -- -y
+curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.2/install.sh | bash -s -- -y
 ```
 
 ## License

package/README_CN.md

@@ -34,18 +34,20 @@ exec zsh -l
 
 ```bash
 # 预览安装过程，不修改本机环境
-easy-command --dry-run
+npx easy-command --dry-run
 
 # 检查 Shell、依赖、托管仓库和 .zshrc 配置
-easy-command doctor
+npx easy-command doctor
 
 # 恢复缺失的托管文件和配置
-easy-command repair -y
+npx easy-command repair -y
 
 # 安全更新 Oh My Zsh 和托管插件
-easy-command update -y
+npx easy-command update -y
 ```
 
+`npx` 无需全局安装即可运行命令。若希望直接使用更短的 `easy-command` 命令，可执行 `npm install -g easy-command`。
+
 ## 安装后即可使用
 
 - `agnoster` 提示符：显示用户名、当前路径、Git 分支和工作区状态。
@@ -119,13 +121,13 @@ bash install.sh -y
 生产环境建议固定到发布标签，而不是直接使用 `main`：
 
 ```bash
-npx easy-command@2.0.1 -y
+npx easy-command@2.0.2 -y
 ```
 
 或者不使用 npm：
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.1/install.sh | bash -s -- -y
+curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.2/install.sh | bash -s -- -y
 ```
 
 ## 许可

package/install.sh

@@ -2,7 +2,7 @@
 
 set -Eeuo pipefail
 
-readonly VERSION='2.0.1'
+readonly VERSION='2.0.2'
 readonly BEGIN_MARKER='# >>> easy-command zsh >>>'
 readonly END_MARKER='# <<< easy-command zsh <<<'
 readonly BASE_DIR_NAME='.easy-command'
@@ -110,7 +110,9 @@ write_file() {
 }
 
 determine_target_home() {
-    TARGET_HOME="$(getent passwd "$TARGET_USER" | cut -d: -f6 2>/dev/null || true)"
+    if command -v getent >/dev/null 2>&1; then
+        TARGET_HOME="$(getent passwd "$TARGET_USER" | cut -d: -f6 2>/dev/null || true)"
+    fi
     if [[ -z "$TARGET_HOME" && "$(uname -s)" == 'Darwin' ]]; then
         TARGET_HOME="$(dscl . -read "/Users/$TARGET_USER" NFSHomeDirectory | awk '{print $2}')"
     fi
@@ -364,7 +366,14 @@ change_login_shell() {
 
     local zsh_path
     zsh_path="$(command -v zsh)"
-    grep -qx "$zsh_path" /etc/shells || fail "$zsh_path is not listed in /etc/shells."
+    if ! grep -qx "$zsh_path" /etc/shells; then
+        if [[ -x /bin/zsh ]] && grep -qx '/bin/zsh' /etc/shells; then
+            warn "$zsh_path is not listed in /etc/shells; using /bin/zsh as the login shell."
+            zsh_path='/bin/zsh'
+        else
+            fail "$zsh_path is not listed in /etc/shells. Use --no-chsh or add the path to /etc/shells first."
+        fi
+    fi
     run_as_root chsh -s "$zsh_path" "$TARGET_USER"
 }
 
@@ -384,7 +393,9 @@ doctor() {
     local configured_shell=''
 
     info "Checking easy-command for $TARGET_USER"
-    configured_shell="$(getent passwd "$TARGET_USER" | cut -d: -f7 2>/dev/null || true)"
+    if command -v getent >/dev/null 2>&1; then
+        configured_shell="$(getent passwd "$TARGET_USER" | cut -d: -f7 2>/dev/null || true)"
+    fi
     if [[ -z "$configured_shell" && "$(uname -s)" == 'Darwin' ]]; then
         configured_shell="$(dscl . -read "/Users/$TARGET_USER" UserShell | awk '{print $2}')"
     fi
@@ -489,9 +500,9 @@ main() {
             confirm "Install easy-command $VERSION for $TARGET_USER?"
             install_packages
             ensure_repositories
+            change_login_shell
             write_zshrc_block
             configure_git_aliases
-            change_login_shell
             info "Installed easy-command $VERSION for $TARGET_USER. Reconnect or run: exec zsh -l"
             ;;
         repair)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-command",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Configure a polished Zsh terminal with one command.",
   "license": "MIT",
   "bin": {