diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc index b03ce4d..b8b5532 100644 --- a/assets/default/dotfiles/bashrc +++ b/assets/default/dotfiles/bashrc @@ -23,6 +23,7 @@ fi if [[ "$DET_OS" == "linux" ]]; then ANDROID_SDK=$HOME/workspace/adt-bundle-linux/sdk + GOROOT=/usr/local/go elif [[ "$DET_OS" == "mac" ]]; then ANDROID_SDK=$HOME/workspace/android-sdk-macosx diff --git a/assets/default/fish/init/paths.fish b/assets/default/fish/init/paths.fish index c2beaad..f2f6f5c 100644 --- a/assets/default/fish/init/paths.fish +++ b/assets/default/fish/init/paths.fish @@ -56,6 +56,7 @@ _maybe_set -p PATH "$HOME/.cargo/bin" # Golang paths set -gx GOPATH $HOME/workspace/go_path _maybe_set -p PATH "$GOPATH/bin" +_maybe_set -p PATH "/usr/local/go/bin" # Android paths if [ $det_os = "linux" ] diff --git a/master-cookbook b/master-cookbook index 89811d1..24b95fa 100755 --- a/master-cookbook +++ b/master-cookbook @@ -66,6 +66,7 @@ if [ "$(uname)" == 'Darwin' ]; then fi recipe 'git' recipe 'vim-settings' +recipe 'golang' recipe 'fish' if $install_ui_terms ; then recipe 'alacritty' diff --git a/recipes/default/golang b/recipes/default/golang index 6125d8e..39d94b6 100644 --- a/recipes/default/golang +++ b/recipes/default/golang @@ -2,12 +2,11 @@ # Installs golang from the web -version="1.13.3" +version="1.16.6" if [[ "$UNAME_STR" == "Darwin" ]]; then wget -P "$TMP_DIR/" "http://golang.org/dl/go${version}.darwin-amd64-osx10.8.pkg" installer -pkg "$TMP_DIR/go${version}.darwin-amd64-osx10.8.pkg" elif [[ "$UNAME_STR" == "Linux" ]]; then wget -P "$TMP_DIR/" "http://golang.org/dl/go${version}.linux-amd64.tar.gz" - # Do something - echo "**** Install from $TMP_DIR/go${version}.linux-amd64.tar.gz" + sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf "$TMP_DIR/go${version}.linux-amd64.tar.gz" fi diff --git a/recipes/default/packages b/recipes/default/packages index d8a4804..f9f2c8f 100755 --- a/recipes/default/packages +++ b/recipes/default/packages @@ -19,7 +19,7 @@ packages="$packages neovim vim mercurial universal-ctags tig doxygen shellcheck" case "$PACKAGE_MANAGER" in "port") # Non-standard packages - packages="$packages md5sha1sum gradle go apache-ant" + packages="$packages md5sha1sum gradle apache-ant" # Python packages packages="$packages python27 py27-ipython py27-pip py27-six py27-tox py27-flake8 py27-virtualenv" packages="$packages python39 py39-ipython py39-pip py39-six py39-tox py39-flake8 py39-virtualenv py39-black" @@ -52,7 +52,7 @@ case "$PACKAGE_MANAGER" in sudo port select --set virtualenv virtualenv39 ;; "apt-get") - packages="$packages build-essential golang-go" + packages="$packages build-essential" # Neovim python plugins packages="$packages python3-neovim" # Python packages