From a55e3ca1e2eef693485e2185eecbe00b84d0c0e8 Mon Sep 17 00:00:00 2001 From: laily Date: Wed, 19 Feb 2025 17:21:00 +0800 Subject: [PATCH] feat: add gvm --- git/.gitignore | 1 + script/fish-init.sh | 2 +- script/go-install.sh | 45 +++++++++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/git/.gitignore b/git/.gitignore index c9915ba..8191102 100644 --- a/git/.gitignore +++ b/git/.gitignore @@ -35,3 +35,4 @@ go.work.sum _set_env*.sh .env* !.env.example +Makefile.local diff --git a/script/fish-init.sh b/script/fish-init.sh index 224920d..94ced5d 100755 --- a/script/fish-init.sh +++ b/script/fish-init.sh @@ -2,7 +2,7 @@ echo 'Link fish config file' if [ -f "$HOME/.config/fish/config.fish" ]; then - mv $HOME/.config/fish/config.fish $HOME/.config/fish/config.fish.bak + mv $HOME/.config/fish/config.fish $HOME/.config/fish/config.fish.bak fi ln -s $HOME/.dotfile/fish/config.fish $HOME/.config/fish/config.fish diff --git a/script/go-install.sh b/script/go-install.sh index f7bd31c..fb09f8f 100644 --- a/script/go-install.sh +++ b/script/go-install.sh @@ -1,25 +1,32 @@ #!/bin/bash set -e -# install neovim -os_arch=$(uname -s)-$(uname -m) +# install gvm +bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) -case $os_arch in - "Darwin-x86_64") - cd /usr/local - wget https://golang.google.cn/dl/go1.23.2.linux-amd64.tar.gz - tar zxvf go1.23.2.linux-amd64.tar.gz - ;; - "Linux-x86_64"|"Linux-arm64") - cd /tmp - rm -rf nvim-linux64.tar.gz - wget https://go.dev/dl/go1.23.2.linux-amd64.tar.gz - tar zxvf go1.23.2.linux-amd64.tar.gz - mv go /usr/local/ - sudo ln -s /usr/local/go/bin/go/usr/local/bin/go - ;; -esac - - +# install gvm on fish +fish -c "fisher install JGAntunes/fish-gvm" +fish -c "fisher install edc/bass" +# install go +fish -c "gvm install go1.24.0" +fish -c "gvm use go1.24.0 --default" +# # install neovim +# os_arch=$(uname -s)-$(uname -m) + +# case $os_arch in +# "Darwin-x86_64") +# cd /usr/local +# wget https://golang.google.cn/dl/go1.23.2.linux-amd64.tar.gz +# tar zxvf go1.23.2.linux-amd64.tar.gz +# ;; +# "Linux-x86_64"|"Linux-arm64") +# cd /tmp +# rm -rf nvim-linux64.tar.gz +# wget https://go.dev/dl/go1.23.2.linux-amd64.tar.gz +# tar zxvf go1.23.2.linux-amd64.tar.gz +# mv go /usr/local/ +# sudo ln -s /usr/local/go/bin/go/usr/local/bin/go +# ;; +# esac