m1ngsama/chopsticks
1
0
Fork 0
mirror of https://oauth2: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@github.com/m1ngsama/chopsticks.git synced 2026-05-13 20:41:04 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix noninteractive plugin installation (#59)

Browse source
This commit is contained in:
m1ngsama 2026-05-13 18:22:12 +08:00 committed by GitHub
parent b2835d3cae
commit 2514d2e803
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
install.sh
View file

@ -493,10 +493,21 @@ fi
# vim # vim
[ -f "$SCRIPT_DIR/.vimrc" ] || die ".vimrc not found in $SCRIPT_DIR — is this the chopsticks repo?" [ -f "$SCRIPT_DIR/.vimrc" ] || die ".vimrc not found in $SCRIPT_DIR — is this the chopsticks repo?"
if ! command -v vim >/dev/null 2>&1; then resolve_vim() {
if [[ $OS == "macos" ]]; then
for vim_path in /opt/homebrew/bin/vim /usr/local/bin/vim; do
[[ -x "$vim_path" ]] && { echo "$vim_path"; return; }
done
fi
command -v vim 2>/dev/null || true
}
VIM_BIN="$(resolve_vim)"
if [[ -z "$VIM_BIN" ]]; then
warn "vim not found — attempting to install" warn "vim not found — attempting to install"
if pkg_install vim vim vim vim 2>/dev/null; then if pkg_install vim vim vim vim 2>/dev/null; then
ok "vim installed" ok "vim installed"
VIM_BIN="$(resolve_vim)"
else else
die "vim not found and could not be installed automatically. die "vim not found and could not be installed automatically.
Ubuntu/Debian: sudo apt install vim Ubuntu/Debian: sudo apt install vim
@ -505,8 +516,9 @@ if ! command -v vim >/dev/null 2>&1; then
macOS: brew install vim" macOS: brew install vim"
fi fi
fi fi
ok "Found: $(vim --version | head -n1)" [[ -n "$VIM_BIN" ]] || die "vim installed but not found in PATH"
vim --version | grep -q 'Vi IMproved 8\|Vi IMproved 9' || \ ok "Found: $("$VIM_BIN" --version | head -n1) ($VIM_BIN)"
"$VIM_BIN" --version | grep -q 'Vi IMproved 8\|Vi IMproved 9' || \
warn "Vim 8.0+ recommended for full async/LSP support — some features may not work" warn "Vim 8.0+ recommended for full async/LSP support — some features may not work"
# Node.js (optional — vim-lsp needs no Node.js; only npm formatters do) # Node.js (optional — vim-lsp needs no Node.js; only npm formatters do)
@ -596,14 +608,15 @@ fi
step "Installing Vim plugins" step "Installing Vim plugins"
_vim_run() { _vim_run() {
if { true </dev/tty; } 2>/dev/null; then local vim_cmd="$1" batch_script
if [[ -t 1 ]] && { true </dev/tty; } 2>/dev/null; then
# Interactive terminal: vim uses alternate screen; user sees progress # Interactive terminal: vim uses alternate screen; user sees progress
vim "$@" </dev/tty "$VIM_BIN" -u "$SCRIPT_DIR/.vimrc" +"$vim_cmd" +qall </dev/tty
else else
# No TTY (SSH batch, CI): do NOT redirect stdin (causes "Error reading input" exit) # Batch/agent/CI: avoid vim-plug's screen UI, which may try to read input.
# or stdout (breaks async job callbacks — partial install). batch_script="$_TMPDIR/vim-run.vim"
# Redirect only stderr; escape sequences appear on stdout but installation succeeds. printf '%s\nqa!\n' "$vim_cmd" > "$batch_script"
vim --not-a-term "$@" 2>/dev/null "$VIM_BIN" -u "$SCRIPT_DIR/.vimrc" -i NONE -n -es -N -S "$batch_script"
fi fi
} }
@ -628,7 +641,7 @@ qa!
VIMEOF VIMEOF
CHOPSTICKS_REQUIRED_PLUGINS="$required_file" \ CHOPSTICKS_REQUIRED_PLUGINS="$required_file" \
vim -u "$SCRIPT_DIR/.vimrc" -i NONE -es -N -S "$verify_script" >/dev/null 2>&1 || return 1 "$VIM_BIN" -u "$SCRIPT_DIR/.vimrc" -i NONE -es -N -S "$verify_script" >/dev/null 2>&1 || return 1
[[ -s "$required_file" ]] || return 1 [[ -s "$required_file" ]] || return 1
while IFS= read -r dir; do while IFS= read -r dir; do
@ -646,8 +659,8 @@ VIMEOF
if [[ -d "$HOME/.vim/plugged" ]] && [[ -n "$(find "$HOME/.vim/plugged" -mindepth 1 -maxdepth 1 2>/dev/null)" ]]; then if [[ -d "$HOME/.vim/plugged" ]] && [[ -n "$(find "$HOME/.vim/plugged" -mindepth 1 -maxdepth 1 2>/dev/null)" ]]; then
warn "PlugClean: removing plugins not listed in .vimrc from ~/.vim/plugged" warn "PlugClean: removing plugins not listed in .vimrc from ~/.vim/plugged"
fi fi
_vim_run +'PlugClean!' +qall || true # remove plugins no longer in vimrc; ignore exit code (none expected) _vim_run 'PlugClean!' || true # remove plugins no longer in vimrc; ignore exit code (none expected)
_vim_run +'PlugInstall --sync' +qall || true # fzf post-install hook may exit non-zero; harmless _vim_run 'PlugInstall --sync' || true # fzf post-install hook may exit non-zero; harmless
verify_plugins || die "Plugin installation failed — retry with a stable network connection." verify_plugins || die "Plugin installation failed — retry with a stable network connection."