From 374d676dfb2457c0f0577e2a28db43d25b1da4f8 Mon Sep 17 00:00:00 2001 From: neo Date: Mon, 6 Feb 2023 20:02:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=86=85=E7=BD=AEcas?= =?UTF-8?q?k&&services?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 2 + install.sh | 105 +++++++++++++++++++++++++++--------- 2 files changed, 83 insertions(+), 24 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c326eea..0ae3df2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -96,8 +96,10 @@ jobs: run: | HOMEBREW_BREW_DEFAULT_GIT_REMOTE="https://github.com/Homebrew/brew" HOMEBREW_CORE_DEFAULT_GIT_REMOTE="https://github.com/Homebrew/homebrew-core" + HOMEBREW_CASK_DEFAULT_GIT_REMOTE="https://github.com/Homebrew/homebrew-cask" export HOMEBREW_BREW_GIT_REMOTE="${HOMEBREW_BREW_DEFAULT_GIT_REMOTE/#https/git}" export HOMEBREW_CORE_GIT_REMOTE="${HOMEBREW_CORE_DEFAULT_GIT_REMOTE/#https/git}" + export HOMEBREW_CASK_GIT_REMOTE="${HOMEBREW_CASK_DEFAULT_GIT_REMOTE/#https/git}" /bin/bash -c "$(cat install.sh)" - run: brew config diff --git a/install.sh b/install.sh index c33713e..adc905a 100755 --- a/install.sh +++ b/install.sh @@ -170,9 +170,13 @@ HOMEBREW_BREW_DEFAULT_GIT_REMOTE="https://mirrors.ustc.edu.cn/brew.git" #HOMEBREW_CORE_DEFAULT_GIT_REMOTE="https://github.com/Homebrew/homebrew-core" HOMEBREW_CORE_DEFAULT_GIT_REMOTE="https://mirrors.ustc.edu.cn/homebrew-core.git" +HOMEBREW_CASK_DEFAULT_GIT_REMOTE="https://mirrors.ustc.edu.cn/homebrew-cask.git" +HOMEBREW_SERVICES_DEFAULT_GIT_REMOTE="https://gitlab.com/mirrorx/homebrew-services.git" + # Use remote URLs of Homebrew repositories from environment if set. HOMEBREW_BREW_GIT_REMOTE="${HOMEBREW_BREW_GIT_REMOTE:-"${HOMEBREW_BREW_DEFAULT_GIT_REMOTE}"}" HOMEBREW_CORE_GIT_REMOTE="${HOMEBREW_CORE_GIT_REMOTE:-"${HOMEBREW_CORE_DEFAULT_GIT_REMOTE}"}" +HOMEBREW_CASK_GIT_REMOTE="${HOMEBREW_CASK_GIT_REMOTE:-"${HOMEBREW_CASK_DEFAULT_GIT_REMOTE}"}" # The URLs with and without the '.git' suffix are the same Git remote. Do not prompt. if [[ "${HOMEBREW_BREW_GIT_REMOTE}" == "${HOMEBREW_BREW_DEFAULT_GIT_REMOTE}.git" ]] then @@ -182,6 +186,10 @@ if [[ "${HOMEBREW_CORE_GIT_REMOTE}" == "${HOMEBREW_CORE_DEFAULT_GIT_REMOTE}.git" then HOMEBREW_CORE_GIT_REMOTE="${HOMEBREW_CORE_DEFAULT_GIT_REMOTE}" fi +if [[ "${HOMEBREW_CASK_GIT_REMOTE}" == "${HOMEBREW_CASK_DEFAULT_GIT_REMOTE}.git" ]] +then + HOMEBREW_CASK_GIT_REMOTE="${HOMEBREW_CASK_DEFAULT_GIT_REMOTE}" +fi export HOMEBREW_{BREW,CORE}_GIT_REMOTE # TODO: bump version when new macOS is released or announced @@ -534,6 +542,8 @@ EOABORT )" fi HOMEBREW_CORE="${HOMEBREW_REPOSITORY}/Library/Taps/homebrew/homebrew-core" +HOMEBREW_CASK="${HOMEBREW_REPOSITORY}/Library/Taps/homebrew/homebrew-cask" +HOMEBREW_SERVICES="${HOMEBREW_REPOSITORY}/Library/Taps/homebrew/homebrew-services" check_run_command_as_root @@ -758,6 +768,14 @@ then additional_shellenv_commands+=("export HOMEBREW_CORE_GIT_REMOTE=\"${HOMEBREW_CORE_GIT_REMOTE}\"") fi +if [[ "${HOMEBREW_CASK_DEFAULT_GIT_REMOTE}" != "${HOMEBREW_CASK_GIT_REMOTE}" ]] +then + ohai "HOMEBREW_CASK_GIT_REMOTE is set to a non-default URL:" + echo "${tty_underline}${HOMEBREW_CASK_GIT_REMOTE}${tty_reset} will be used as the Homebrew/homebrew-core Git remote." + non_default_repos="${non_default_repos:-}${non_default_repos:+ and }Homebrew/homebrew-core" + additional_shellenv_commands+=("export HOMEBREW_CASK_GIT_REMOTE=\"${HOMEBREW_CASK_GIT_REMOTE}\"") +fi + if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API-}" && -n "${HOMEBREW_INSTALL_FROM_API-}" ]] then ohai "HOMEBREW_INSTALL_FROM_API is set." @@ -768,6 +786,8 @@ ohai "安装提示" echo "中文安装教程（建议收藏）：https://brew.idayer.com/" +echo "也可以查阅，Mac下镜像飞速安装Homebrew教程 ：https://zhuanlan.zhihu.com/p/90508170" + echo "如果你想换源，可以使用镜像助手：https://brew.idayer.com/guide/change-source/" echo @@ -961,26 +981,67 @@ ohai "Downloading and installing Homebrew..." then export -n HOMEBREW_DEVELOPER fi - elif [[ ! -d "${HOMEBREW_CORE}" ]] - then - ohai "Tapping homebrew/core" - ( - execute "${MKDIR[@]}" "${HOMEBREW_CORE}" - cd "${HOMEBREW_CORE}" >/dev/null || return + else + if [[ ! -d "${HOMEBREW_CORE}" ]] + then + ohai "Tapping homebrew/core" + ( + execute "${MKDIR[@]}" "${HOMEBREW_CORE}" + cd "${HOMEBREW_CORE}" >/dev/null || return - execute "git" "init" "-q" - execute "git" "config" "remote.origin.url" "${HOMEBREW_CORE_GIT_REMOTE}" - execute "git" "config" "remote.origin.fetch" "+refs/heads/*:refs/remotes/origin/*" - execute "git" "config" "--bool" "core.autocrlf" "false" - execute "git" "config" "--bool" "core.symlinks" "true" - execute "git" "fetch" "--force" "origin" "refs/heads/master:refs/remotes/origin/master" - execute "git" "remote" "set-head" "origin" "--auto" >/dev/null - execute "git" "reset" "--hard" "origin/master" + execute "git" "init" "-q" + execute "git" "config" "remote.origin.url" "${HOMEBREW_CORE_GIT_REMOTE}" + execute "git" "config" "remote.origin.fetch" "+refs/heads/*:refs/remotes/origin/*" + execute "git" "config" "--bool" "core.autocrlf" "false" + execute "git" "config" "--bool" "core.symlinks" "true" + execute "git" "fetch" "--force" "origin" "refs/heads/master:refs/remotes/origin/master" + execute "git" "remote" "set-head" "origin" "--auto" >/dev/null + execute "git" "reset" "--hard" "origin/master" - cd "${HOMEBREW_REPOSITORY}" >/dev/null || return - ) || exit 1 + cd "${HOMEBREW_REPOSITORY}" >/dev/null || return + ) || exit 1 + + if [[ ! -d "${HOMEBREW_CASK}" ]] + then + ohai "Tapping homebrew/cask" + ( + execute "${MKDIR[@]}" "${HOMEBREW_CASK}" + cd "${HOMEBREW_CASK}" >/dev/null || return + + execute "git" "init" "-q" + execute "git" "config" "remote.origin.url" "${HOMEBREW_CASK_GIT_REMOTE}" + execute "git" "config" "remote.origin.fetch" "+refs/heads/*:refs/remotes/origin/*" + execute "git" "config" "--bool" "core.autocrlf" "false" + execute "git" "config" "--bool" "core.symlinks" "true" + execute "git" "fetch" "--force" "origin" "refs/heads/master:refs/remotes/origin/master" + execute "git" "remote" "set-head" "origin" "--auto" >/dev/null + execute "git" "reset" "--hard" "origin/master" + + cd "${HOMEBREW_REPOSITORY}" >/dev/null || return + ) || exit 1 + fi + + if [[ ! -d "${HOMEBREW_SERVICES}" ]] + then + ohai "Tapping homebrew/services" + ( + execute "${MKDIR[@]}" "${HOMEBREW_SERVICES}" + cd "${HOMEBREW_SERVICES}" >/dev/null || return + + execute "git" "init" "-q" + execute "git" "config" "remote.origin.url" "${HOMEBREW_SERVICES_DEFAULT_GIT_REMOTE}" + execute "git" "config" "remote.origin.fetch" "+refs/heads/*:refs/remotes/origin/*" + execute "git" "config" "--bool" "core.autocrlf" "false" + execute "git" "config" "--bool" "core.symlinks" "true" + execute "git" "fetch" "--force" "origin" "refs/heads/master:refs/remotes/origin/master" + execute "git" "remote" "set-head" "origin" "--auto" >/dev/null + execute "git" "reset" "--hard" "origin/master" + + cd "${HOMEBREW_REPOSITORY}" >/dev/null || return + ) || exit 1 + fi + fi fi - execute "${HOMEBREW_PREFIX}/bin/brew" "update" "--force" "--quiet" ) || exit 1 @@ -1065,11 +1126,6 @@ then printf " %s\n" "${additional_shellenv_commands[@]}" fi -echo "- 🎉 恭喜，安装成功！运行 \`brew help\` 开始体验吧" -echo "- 更多文档: " -echo " ${tty_underline}https://docs.brew.sh${tty_reset}" -echo " ${tty_underline}https://brew.idayer.com${tty_reset}" - if [[ -n "${HOMEBREW_ON_LINUX-}" ]] then echo "- Install Homebrew's dependencies if you have sudo access:" @@ -1097,8 +1153,9 @@ EOS fi cat <