mirror of
https://bitbucket.org/siakitem/my-pi.git
synced 2026-10-26 10:45:22 +00:00
fix(install.sh/update.sh): Homebrew 升级免确认并显式按 formula 升级
- Homebrew 7 默认进入 ask 模式,升级或安装带依赖时会停下等待 [y/n]。 用户运行脚本(以及 install.sh 中逐项确认后)已构成授权,统一加 HOMEBREW_NO_ASK=1;用环境变量而非 --yes,旧版 Homebrew 不会因未知 参数报错。 - update.sh 的 formula 升级显式加 --formula:kotlin-lsp 来自 jetbrains/utils tap,不加时 brew 会把短名当成 cask,报 “Cask 'kotlin-lsp' is not installed” 而升级失败。 Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
parent
281249ad87
commit
f237025cf9
+4
-4
@@ -129,13 +129,13 @@ install_codegraph() {
|
|||||||
|
|
||||||
install_kotlin_lsp() {
|
install_kotlin_lsp() {
|
||||||
require_brew || return 1
|
require_brew || return 1
|
||||||
brew install JetBrains/utils/kotlin-lsp || return 1
|
HOMEBREW_NO_ASK=1 brew install JetBrains/utils/kotlin-lsp || return 1
|
||||||
command -v kotlin-lsp >/dev/null 2>&1
|
command -v kotlin-lsp >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
install_java_21() {
|
install_java_21() {
|
||||||
require_brew || return 1
|
require_brew || return 1
|
||||||
brew install openjdk@21 || return 1
|
HOMEBREW_NO_ASK=1 brew install openjdk@21 || return 1
|
||||||
java_home=$(brew --prefix openjdk@21 2>/dev/null) || return 1
|
java_home=$(brew --prefix openjdk@21 2>/dev/null) || return 1
|
||||||
PATH="$java_home/bin:$PATH"
|
PATH="$java_home/bin:$PATH"
|
||||||
export PATH
|
export PATH
|
||||||
@@ -148,7 +148,7 @@ install_java_21() {
|
|||||||
|
|
||||||
install_jdtls() {
|
install_jdtls() {
|
||||||
require_brew || return 1
|
require_brew || return 1
|
||||||
brew install jdtls || return 1
|
HOMEBREW_NO_ASK=1 brew install jdtls || return 1
|
||||||
command -v jdtls >/dev/null 2>&1
|
command -v jdtls >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,7 +171,7 @@ install_kitty() {
|
|||||||
case $(uname -s) in
|
case $(uname -s) in
|
||||||
Darwin)
|
Darwin)
|
||||||
require_brew || return 1
|
require_brew || return 1
|
||||||
brew install --cask kitty || return 1
|
HOMEBREW_NO_ASK=1 brew install --cask kitty || return 1
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
if ! command -v curl >/dev/null 2>&1; then
|
if ! command -v curl >/dev/null 2>&1; then
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ update_brew_formula_if_installed() {
|
|||||||
say "✓ $description 已是最新版本。"
|
say "✓ $description 已是最新版本。"
|
||||||
else
|
else
|
||||||
say "发现 $description 有新版本,正在升级。"
|
say "发现 $description 有新版本,正在升级。"
|
||||||
brew upgrade "$formula" || record_update_failure "$description"
|
HOMEBREW_NO_ASK=1 brew upgrade --formula "$formula" || record_update_failure "$description"
|
||||||
fi
|
fi
|
||||||
elif command -v "$command_name" >/dev/null 2>&1; then
|
elif command -v "$command_name" >/dev/null 2>&1; then
|
||||||
say "- $description 已安装,但不由 Homebrew 管理,已保留现有安装。"
|
say "- $description 已安装,但不由 Homebrew 管理,已保留现有安装。"
|
||||||
@@ -228,7 +228,7 @@ update_kitty() {
|
|||||||
say "✓ Kitty 已是最新版本。"
|
say "✓ Kitty 已是最新版本。"
|
||||||
else
|
else
|
||||||
say "发现 Kitty 有新版本,正在升级。"
|
say "发现 Kitty 有新版本,正在升级。"
|
||||||
brew upgrade --cask kitty || record_update_failure "Kitty"
|
HOMEBREW_NO_ASK=1 brew upgrade --cask kitty || record_update_failure "Kitty"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
record_update_failure "Kitty"
|
record_update_failure "Kitty"
|
||||||
|
|||||||
Reference in New Issue
Block a user