ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #461 from return42/fix-morty 

[fix] morty & filtron: don't use golang installed by package manager
This commit is contained in:
Markus Heiser 2021-10-30 17:26:44 +00:00 committed by GitHub
parent 8f18c69f7a 9f30d5b1f8
commit a6c4806239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/filtron.sh
View File

@ -340,7 +340,7 @@ EOF
cat > "$GO_ENV" <<EOF cat > "$GO_ENV" <<EOF
export GOPATH=\$HOME/go-apps export GOPATH=\$HOME/go-apps
export PATH=\$PATH:\$HOME/local/go/bin:\$GOPATH/bin export PATH=\$HOME/local/go/bin:\$GOPATH/bin:\$PATH
EOF EOF
echo "Environment $GO_ENV has been setup." echo "Environment $GO_ENV has been setup."
@ -359,7 +359,7 @@ install_filtron() {
rst_title "Install filtron in user's ~/go-apps" section rst_title "Install filtron in user's ~/go-apps" section
echo echo
tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" 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 EOF
} }
@ -367,7 +367,7 @@ update_filtron() {
rst_title "Update filtron" section rst_title "Update filtron" section
echo echo
tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" 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 EOF
} }

16
utils/morty.sh
View File

@ -340,7 +340,7 @@ EOF
cat > "$GO_ENV" <<EOF cat > "$GO_ENV" <<EOF
export GOPATH=\$HOME/go-apps export GOPATH=\$HOME/go-apps
export PATH=\$PATH:\$HOME/local/go/bin:\$GOPATH/bin export PATH=\$HOME/local/go/bin:\$GOPATH/bin:\$PATH
EOF EOF
echo "Environment $GO_ENV has been setup." echo "Environment $GO_ENV has been setup."
@ -359,12 +359,7 @@ install_morty() {
rst_title "Install morty in user's ~/go-apps" section rst_title "Install morty in user's ~/go-apps" section
echo echo
tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr"
go get -v -u github.com/asciimoo/morty go install -v github.com/asciimoo/morty@latest
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 .
EOF EOF
} }
@ -372,12 +367,7 @@ update_morty() {
rst_title "Update morty" section rst_title "Update morty" section
echo echo
tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr" tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr"
go get -v -u github.com/asciimoo/morty go install -v github.com/asciimoo/morty@latest
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 .
EOF EOF
} }