Skip to content
代码片段 群组 项目
提交 4c88b0b6 编辑于 作者: quentin.michaud's avatar quentin.michaud
浏览文件

Improve source instructions

Improve the "source ..." instructions to have gdk and other tools
in the path with support for fish, elvish, and nushell shells.
上级 69e9fce8
No related branches found
No related tags found
无相关合并请求
...@@ -17,6 +17,9 @@ asdf_install() { ...@@ -17,6 +17,9 @@ asdf_install() {
asdf_add_initializer "${HOME}/.bashrc" "asdf.sh" asdf_add_initializer "${HOME}/.bashrc" "asdf.sh"
asdf_add_initializer "${HOME}/.zshrc" "asdf.sh" asdf_add_initializer "${HOME}/.zshrc" "asdf.sh"
asdf_add_initializer "${HOME}/.config/fish/config.fish" "asdf.fish"
asdf_add_initializer "${HOME}/.config/elvish/rc.elv" "asdf.elv"
asdf_add_initializer "${HOME}/.config/nushell/config.nu" "asdf.nu"
return 0 return 0
fi fi
...@@ -26,6 +29,7 @@ asdf_install() { ...@@ -26,6 +29,7 @@ asdf_install() {
asdf_add_initializer() { asdf_add_initializer() {
[[ -f "${1}" ]] && echo -e "\n# Added by GDK bootstrap\nsource ${CURRENT_ASDF_DIR}/${2}" >> "${1}" [[ -f "${1}" ]] && echo -e "\n# Added by GDK bootstrap\nsource ${CURRENT_ASDF_DIR}/${2}" >> "${1}"
return 0;
} }
asdf_install_tools() { asdf_install_tools() {
...@@ -72,10 +76,19 @@ gdk_mark_bootstrapped() { ...@@ -72,10 +76,19 @@ gdk_mark_bootstrapped() {
echo "INFO: Bootstrap successful!" echo "INFO: Bootstrap successful!"
if ! asdf_opt_out; then if ! asdf_opt_out; then
echo "INFO: To make sure GDK commands are available in this shell, run:" echo "INFO: To make sure GDK commands are available in this shell, please run the command corresponding to your shell."
echo echo
echo "sh / bash / zsh:"
echo "source \"${CURRENT_ASDF_DIR}/asdf.sh\"" echo "source \"${CURRENT_ASDF_DIR}/asdf.sh\""
echo echo
echo "fish:"
echo "source \"${CURRENT_ASDF_DIR}/asdf.fish\""
echo
echo "elvish:"
echo "source \"${CURRENT_ASDF_DIR}/asdf.elv\""
echo
echo "nushell:"
echo "source \"${CURRENT_ASDF_DIR}/asdf.nu\""
fi fi
} }
......
...@@ -34,6 +34,9 @@ GDK_CLONE_BRANCH="${4-main}" ...@@ -34,6 +34,9 @@ GDK_CLONE_BRANCH="${4-main}"
CURRENT_ASDF_DIR="${ASDF_DIR:-${HOME}/.asdf}" CURRENT_ASDF_DIR="${ASDF_DIR:-${HOME}/.asdf}"
ASDF_SH_PATH="${CURRENT_ASDF_DIR}/asdf.sh" ASDF_SH_PATH="${CURRENT_ASDF_DIR}/asdf.sh"
ASDF_FISH_PATH="${CURRENT_ASDF_DIR}/asdf.fish"
ASDF_ELVISH_PATH="${CURRENT_ASDF_DIR}/asdf.elv"
ASDF_NUSHELL_PATH="${CURRENT_ASDF_DIR}/asdf.nu"
REQUIRED_COMMANDS=(git make) REQUIRED_COMMANDS=(git make)
REQUIRED_ENV_VARS=(GITLAB_LICENSE_KEY) REQUIRED_ENV_VARS=(GITLAB_LICENSE_KEY)
...@@ -125,9 +128,21 @@ bin/rails runner 'License.create!(data: ENV["GITLAB_LICENSE_KEY"])' ...@@ -125,9 +128,21 @@ bin/rails runner 'License.create!(data: ENV["GITLAB_LICENSE_KEY"])'
echo echo
echo "INFO: To make sure GDK commands are available in this shell and ensure you're" echo "INFO: To make sure GDK commands are available in this shell and ensure you're"
echo "INFO: in the newly installed GDK directory, please run:" echo "INFO: in the newly installed GDK directory, please run the command corresponding to your shell."
echo echo
echo "sh / bash / zsh:"
echo "source \"${ASDF_SH_PATH}\"" echo "source \"${ASDF_SH_PATH}\""
echo
echo "fish:"
echo "source \"${ASDF_FISH_PATH}\""
echo
echo "elvish:"
echo "source \"${ASDF_ELVISH_PATH}\""
echo
echo "nushell:"
echo "source \"${ASDF_NUSHELL_PATH}\""
echo
echo "then:"
echo "cd ${GDK_PRIMARY_INSTALL_DIR}" echo "cd ${GDK_PRIMARY_INSTALL_DIR}"
echo echo
echo -e "\e[0Ksection_end:$(date +%s):set_up_primary_gdk\r\e[0K" echo -e "\e[0Ksection_end:$(date +%s):set_up_primary_gdk\r\e[0K"
...@@ -141,9 +156,21 @@ cd "../${GDK_PRIMARY_INSTALL_DIR}" || error "Sanity check for ${GDK_PRIMARY_INST ...@@ -141,9 +156,21 @@ cd "../${GDK_PRIMARY_INSTALL_DIR}" || error "Sanity check for ${GDK_PRIMARY_INST
echo echo
echo "INFO: To make sure GDK commands are available in this shell and ensure you're" echo "INFO: To make sure GDK commands are available in this shell and ensure you're"
echo "INFO: in the newly installed GDK directory, please run:" echo "INFO: in the newly installed GDK directory, please run the command corresponding to your shell."
echo echo
echo "sh / bash / zsh:"
echo "source \"${ASDF_SH_PATH}\"" echo "source \"${ASDF_SH_PATH}\""
echo
echo "fish:"
echo "source \"${ASDF_FISH_PATH}\""
echo
echo "elvish:"
echo "source \"${ASDF_ELVISH_PATH}\""
echo
echo "nushell:"
echo "source \"${ASDF_NUSHELL_PATH}\""
echo
echo "then:"
echo "cd ${GDK_SECONDARY_INSTALL_DIR}" echo "cd ${GDK_SECONDARY_INSTALL_DIR}"
echo echo
echo -e "\e[0Ksection_end:$(date +%s):set_up_secondary_gdk\r\e[0K" echo -e "\e[0Ksection_end:$(date +%s):set_up_secondary_gdk\r\e[0K"
......
...@@ -19,6 +19,9 @@ DEFAULT_GITLAB_REPO_URL="https://gitlab.com/gitlab-org/gitlab.git" ...@@ -19,6 +19,9 @@ DEFAULT_GITLAB_REPO_URL="https://gitlab.com/gitlab-org/gitlab.git"
DEFAULT_GDK_REPO_URL="https://gitlab.com/gitlab-org/gitlab-development-kit.git" DEFAULT_GDK_REPO_URL="https://gitlab.com/gitlab-org/gitlab-development-kit.git"
CURRENT_ASDF_DIR="${ASDF_DIR:-${HOME}/.asdf}" CURRENT_ASDF_DIR="${ASDF_DIR:-${HOME}/.asdf}"
ASDF_SH_PATH="${CURRENT_ASDF_DIR}/asdf.sh" ASDF_SH_PATH="${CURRENT_ASDF_DIR}/asdf.sh"
ASDF_FISH_PATH="${CURRENT_ASDF_DIR}/asdf.fish"
ASDF_ELVISH_PATH="${CURRENT_ASDF_DIR}/asdf.elv"
ASDF_NUSHELL_PATH="${CURRENT_ASDF_DIR}/asdf.nu"
REQUIRED_COMMANDS=(git make) REQUIRED_COMMANDS=(git make)
...@@ -107,9 +110,19 @@ gdk_install ...@@ -107,9 +110,19 @@ gdk_install
echo echo
echo "INFO: To make sure GDK commands are available in this shell, please run:" echo "INFO: To make sure GDK commands are available in this shell, please run the command corresponding to your shell."
echo echo
echo "sh / bash / zsh:"
echo "source \"${ASDF_SH_PATH}\"" echo "source \"${ASDF_SH_PATH}\""
echo
echo "fish:"
echo "source \"${ASDF_FISH_PATH}\""
echo
echo "elvish:"
echo "source \"${ASDF_ELVISH_PATH}\""
echo
echo "nushell:"
echo "source \"${ASDF_NUSHELL_PATH}\""
echo echo
echo "INFO: To ensure you're in the newly installed GDK directory, please run:" echo "INFO: To ensure you're in the newly installed GDK directory, please run:"
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册