Skip to content

Commit

Permalink
More fail-safes for weird occurences.
Browse files Browse the repository at this point in the history
Avoid duplicating logic in the shell files.
  • Loading branch information
Azareal committed Sep 29, 2019
1 parent 235b7ef commit 9859042
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
3 changes: 1 addition & 2 deletions dev-update-linux
@@ -1,6 +1,5 @@
echo "Updating the dependencies"
go get
go get -u github.com/mailru/easyjson/...
./update-deps-linux

echo "Updating Gosora"
git stash
Expand Down
1 change: 1 addition & 0 deletions dev-update-travis
@@ -1,3 +1,4 @@
echo "Building the patcher"
go generate
./update-deps-linux
go build -ldflags="-s -w" -o Patcher "./patcher"
4 changes: 1 addition & 3 deletions install-linux
@@ -1,7 +1,5 @@
echo "Installing the dependencies"
go get -u github.com/mailru/easyjson/...
easyjson -pkg common
go get
./update-deps-linux

echo "Building the installer"
go build -ldflags="-s -w" -o Installer "./cmd/install"
Expand Down
14 changes: 12 additions & 2 deletions update-deps-linux
@@ -1,9 +1,19 @@
echo "Updating the dependencies"
cp ./common/common_easyjson.tgo ./common/common_easyjson.go
{
cp ./common/common_easyjson.tgo ./common/common_easyjson.go
} || {
echo "Failed to copy bundled generated easyjson file"
}
go get
{
easyjson -pkg common
} || {
echo "Defaulting to bundled generated easyjson file"
}
go get

{
go get
} || {
go get -u github.com/mailru/easyjson/...
go get
}

0 comments on commit 9859042

Please sign in to comment.