diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2021-10-30 17:26:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-30 17:26:44 +0000 |
| commit | a6c48062398536ac588b3932bbc4de3652416604 (patch) | |
| tree | 411ad0a0334991ce2fbf222428163fad0e34a18f | |
| parent | 8f18c69f7ab387de18679b46c3d29365310b44d4 (diff) | |
| parent | 9f30d5b1f8f2aef7a5f583014f959cebbef724d6 (diff) | |
Merge pull request #461 from return42/fix-morty
[fix] morty & filtron: don't use golang installed by package manager
| -rwxr-xr-x | utils/filtron.sh | 6 | ||||
| -rwxr-xr-x | utils/morty.sh | 16 |
2 files changed, 6 insertions, 16 deletions
diff --git a/utils/filtron.sh b/utils/filtron.sh index fa661ab8b..4e8d6aa5d 100755 --- a/utils/filtron.sh +++ b/utils/filtron.sh @@ -340,7 +340,7 @@ EOF cat > "$GO_ENV" <<EOF export GOPATH=\$HOME/go-apps -export PATH=\$PATH:\$HOME/local/go/bin:\$GOPATH/bin +export PATH=\$HOME/local/go/bin:\$GOPATH/bin:\$PATH EOF echo "Environment $GO_ENV has been setup." @@ -359,7 +359,7 @@ install_filtron() { rst_title "Install filtron in user's ~/go-apps" section echo tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" -go get -v -u github.com/asciimoo/filtron +go install -v github.com/asciimoo/filtron@latest EOF } @@ -367,7 +367,7 @@ update_filtron() { rst_title "Update filtron" section echo tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" -go get -v -u github.com/asciimoo/filtron +go install -v github.com/asciimoo/filtron@latest EOF } diff --git a/utils/morty.sh b/utils/morty.sh index e1481016f..c04df7a0c 100755 --- a/utils/morty.sh +++ b/utils/morty.sh @@ -340,7 +340,7 @@ EOF cat > "$GO_ENV" <<EOF export GOPATH=\$HOME/go-apps -export PATH=\$PATH:\$HOME/local/go/bin:\$GOPATH/bin +export PATH=\$HOME/local/go/bin:\$GOPATH/bin:\$PATH EOF echo "Environment $GO_ENV has been setup." @@ -359,12 +359,7 @@ install_morty() { rst_title "Install morty in user's ~/go-apps" section echo tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" -go get -v -u github.com/asciimoo/morty -EOF - tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" -cd \$GOPATH/src/github.com/asciimoo/morty -go test -go test -benchmem -bench . +go install -v github.com/asciimoo/morty@latest EOF } @@ -372,12 +367,7 @@ update_morty() { rst_title "Update morty" section echo tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" -go get -v -u github.com/asciimoo/morty -EOF - tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" -cd \$GOPATH/src/github.com/asciimoo/morty -go test -go test -benchmem -bench . +go install -v github.com/asciimoo/morty@latest EOF } |