easy-command 2.0.1 → 2.0.4

package/README.md

@@ -10,10 +10,17 @@ Configure a polished Zsh terminal in one command.
 
 ## INSTALL
 
-### npm
+### npm (recommended)
 
 ```bash
-npx easy-command -y
+npm i -g easy-command
+easy-command -y
+```
+
+Or install globally and configure your terminal in one command:
+
+```bash
+npx easy-command -y --global
 ```
 
 ### GitHub
@@ -46,6 +53,8 @@ easy-command repair -y
 easy-command update -y
 ```
 
+If you do not want a global npm installation, replace `easy-command` in the examples with `npx easy-command`.
+
 ## What you get
 
 - A clean `agnoster` prompt with your user, path, Git branch, and working-tree status.
@@ -81,11 +90,13 @@ bash install.sh -y --no-chsh
 # Remove only the configuration block managed by easy-command
 bash install.sh --uninstall
 
-# Enable optional directory jumping, fuzzy search, and Git aliases
-bash install.sh -y --with-zoxide --with-fzf --with-git-aliases
+# Enable optional fuzzy search and Git aliases
+bash install.sh -y --with-fzf --with-git-aliases
 ```
 
-`zoxide` enables `z <keyword>` directory jumping. `fzf` adds fuzzy history and file searching. Git aliases use the non-conflicting `ec-` prefix, such as `git ec-status`; existing aliases are never overwritten.
+`zoxide` is installed by default. It enables `z <keyword>` directory jumping and `z add <directory>` (or `z a <directory>`) for manually recording a directory. Use `--without-zoxide` to disable it. `fzf` adds fuzzy history and file searching. Git aliases use the non-conflicting `ec-` prefix, such as `git ec-status`; existing aliases are never overwritten.
+
+For a unified interface, use `ec <keyword>` to jump, `ec add <directory>` (or `ec a <directory>`) to record a directory, `ec list` (or `ec l`) to view entries, and `ec del <directory>` (or `ec remove <directory>`) to remove one. `ec doctor`, `ec repair`, `ec update`, `ec install`, `ec uninstall`, and `ec --dry-run` run the matching easy-command maintenance operation. `z` remains available for zoxide compatibility.
 
 ## Requirements
 
@@ -119,13 +130,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.4 -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.4/install.sh | bash -s -- -y
 ```
 
 ## License

package/README_CN.md

@@ -10,10 +10,17 @@
 
 ## 安装
 
-### npm 安装
+### npm 安装（推荐）
 
 ```bash
-npx easy-command -y
+npm i -g easy-command
+easy-command -y
+```
+
+也可以一条命令完成全局安装和终端配置：
+
+```bash
+npx easy-command -y --global
 ```
 
 ### GitHub 安装
@@ -46,6 +53,8 @@ easy-command repair -y
 easy-command update -y
 ```
 
+如不希望全局安装 npm 包，将示例中的 `easy-command` 替换为 `npx easy-command` 即可。
+
 ## 安装后即可使用
 
 - `agnoster` 提示符：显示用户名、当前路径、Git 分支和工作区状态。
@@ -81,11 +90,13 @@ bash install.sh -y --no-chsh
 # 仅删除 easy-command 管理的 .zshrc 配置区块
 bash install.sh --uninstall
 
-# 启用可选的目录跳转、模糊搜索和 Git 快捷操作
-bash install.sh -y --with-zoxide --with-fzf --with-git-aliases
+# 启用可选的模糊搜索和 Git 快捷操作
+bash install.sh -y --with-fzf --with-git-aliases
 ```
 
-`zoxide` 提供 `z <关键词>` 目录跳转；`fzf` 提供历史命令和文件的模糊搜索；Git 快捷操作使用 `ec-` 前缀，例如 `git ec-status`，不会覆盖已有别名。
+默认安装 `zoxide`，可使用 `z <关键词>` 跳转目录，也支持 `z add <目录>` 或 `z a <目录>` 手动记录目录；使用 `--without-zoxide` 可关闭。`fzf` 提供历史命令和文件的模糊搜索；Git 快捷操作使用 `ec-` 前缀，例如 `git ec-status`，不会覆盖已有别名。
+
+统一入口使用 `ec`：`ec <关键词>` 跳转目录，`ec add <目录>` 或 `ec a <目录>` 记录目录，`ec list` 或 `ec l` 查看记录，`ec del <目录>` 或 `ec remove <目录>` 删除记录；`ec doctor`、`ec repair`、`ec update`、`ec install`、`ec uninstall` 和 `ec --dry-run` 执行对应的 easy-command 维护操作。为兼容 zoxide，原有 `z` 命令仍可使用。
 
 ## 系统要求
 
@@ -119,13 +130,13 @@ bash install.sh -y
 生产环境建议固定到发布标签，而不是直接使用 `main`：
 
 ```bash
-npx easy-command@2.0.1 -y
+npx easy-command@2.0.4 -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.4/install.sh | bash -s -- -y
 ```
 
 ## 许可

package/install.sh

@@ -2,7 +2,7 @@
 
 set -Eeuo pipefail
 
-readonly VERSION='2.0.1'
+readonly VERSION='2.0.4'
 readonly BEGIN_MARKER='# >>> easy-command zsh >>>'
 readonly END_MARKER='# <<< easy-command zsh <<<'
 readonly BASE_DIR_NAME='.easy-command'
@@ -11,9 +11,10 @@ ACTION='install'
 ASSUME_YES=false
 CHANGE_LOGIN_SHELL=true
 DRY_RUN=false
-ENABLE_ZOXIDE='auto'
+ENABLE_ZOXIDE=true
 ENABLE_FZF='auto'
 ENABLE_GIT_ALIASES='auto'
+GLOBAL_INSTALL=false
 TARGET_USER="${SUDO_USER:-${USER}}"
 TARGET_HOME=''
 
@@ -39,8 +40,9 @@ Options:
   --user USER         Configure this user. Defaults to the invoking user.
   --no-chsh           Do not change the user's default login shell to zsh.
   --dry-run           Preview changes without installing, writing files, or using sudo.
-  --with-zoxide       Enable optional zoxide directory jumping.
-  --without-zoxide    Disable zoxide in the managed configuration.
+  --global            Install this easy-command version globally with npm first.
+  --with-zoxide       Enable zoxide directory jumping (enabled by default).
+  --without-zoxide    Do not install or enable zoxide.
   --with-fzf          Enable optional fzf history and file searching.
   --without-fzf       Disable fzf in the managed configuration.
   --with-git-aliases  Add non-conflicting global Git aliases prefixed with ec-.
@@ -110,7 +112,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
@@ -187,6 +191,17 @@ install_packages() {
     esac
 }
 
+install_global_package() {
+    "$GLOBAL_INSTALL" || return 0
+    command -v npm >/dev/null 2>&1 || fail 'npm is required for --global. Install Node.js/npm first.'
+
+    if "$DRY_RUN"; then
+        command_preview npm install -g "easy-command@$VERSION"
+    else
+        npm install -g "easy-command@$VERSION"
+    fi
+}
+
 ensure_repository() {
     local repository="$1"
     local destination="$2"
@@ -301,6 +316,60 @@ EOF
 # easy-command: zoxide
 if command -v zoxide >/dev/null 2>&1; then
     eval "$(zoxide init zsh)"
+
+    # Keep zoxide's normal jump behavior and add a short command for recording paths.
+    function z() {
+        if [[ "$1" == 'add' || "$1" == 'a' ]]; then
+            shift
+            command zoxide add "$@"
+        else
+            __zoxide_z "$@"
+        fi
+    }
+
+    # Unified easy-command directory interface. Keep z for zoxide compatibility.
+    function ec() {
+        case "$1" in
+            doctor|repair|update|install|uninstall)
+                if (( $+commands[easy-command] )); then
+                    command easy-command "$@"
+                else
+                    command npx easy-command "$@"
+                fi
+                ;;
+            --dry-run)
+                if (( $+commands[easy-command] )); then
+                    command easy-command "$@"
+                else
+                    command npx easy-command "$@"
+                fi
+                ;;
+            add|a)
+                shift
+                command zoxide add "$@"
+                ;;
+            list|ls|l)
+                shift
+                command zoxide query --list "$@"
+                ;;
+            del|remove)
+                shift
+                command zoxide remove "$@"
+                ;;
+            help|--help|-h)
+                printf '%s\n' \
+                    'Usage: ec <keyword>' \
+                    '       ec add|a <directory>' \
+                    '       ec list|ls|l [keyword]' \
+                    '       ec del|remove <directory>' \
+                    '       ec doctor|repair|update|install|uninstall' \
+                    '       ec --dry-run'
+                ;;
+            *)
+                __zoxide_z "$@"
+                ;;
+        esac
+    }
 fi
 EOF
     fi
@@ -364,7 +433,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 +460,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
@@ -454,6 +532,7 @@ parse_args() {
                 ;;
             --no-chsh) CHANGE_LOGIN_SHELL=false ;;
             --dry-run) DRY_RUN=true ;;
+            --global) GLOBAL_INSTALL=true ;;
             --with-zoxide) ENABLE_ZOXIDE=true ;;
             --without-zoxide) ENABLE_ZOXIDE=false ;;
             --with-fzf) ENABLE_FZF=true ;;
@@ -487,11 +566,12 @@ main() {
             ;;
         install)
             confirm "Install easy-command $VERSION for $TARGET_USER?"
+            install_global_package
             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.4",
   "description": "Configure a polished Zsh terminal with one command.",
   "license": "MIT",
   "bin": {