Skip to content

Commit

Permalink
Merge pull request #289 from Waldz/hotfix/disable-autotags
Browse files Browse the repository at this point in the history
HOTFIX Fix ternary expression (with default value) in Bash scripts
  • Loading branch information
zolia authored Jul 12, 2018
2 parents 32a1774 + bb190ae commit d0bcee1
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ install:
- glide "-home" $GLIDE_HOME install

script:
- BUILD_VERSION=${TRAVIS_TAG:="$BUILD_VERSION_MAJOR-dev.$TRAVIS_BUILD_NUMBER"}
- BUILD_VERSION=${TRAVIS_TAG:-"$BUILD_VERSION_MAJOR-dev.$TRAVIS_BUILD_NUMBER"}
- bin/check_vet
# This check requires development dependency
- bin/builder_run bin/check_lint
Expand Down
4 changes: 2 additions & 2 deletions bin/client_build
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

source bin/helpers/functions.sh

export GOOS=${GOOS:=`go env GOHOSTOS`}
export GOARCH=${GOARCH:=`go env GOHOSTARCH`}
export GOOS=${GOOS:-`go env GOHOSTOS`}
export GOARCH=${GOARCH:-`go env GOHOSTARCH`}
export GOBIN=`pwd`/build/client
echo "Compiling 'mysterium_client' for '$GOOS/$GOARCH'.."

Expand Down
2 changes: 1 addition & 1 deletion bin/client_package_debian
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OS_DIR_CONFIG="/etc/mysterium-client"
OS_DIR_DOC="/usr/share/doc/mysterium-client"
OS_DIR_INSTALLATION="/usr/lib/mysterium-client/installation"
OS_DIR_SUDOERS="/etc/sudoers.d"
BINARY=${BINARY:="build/client/mysterium_client"}
BINARY=${BINARY:-"build/client/mysterium_client"}

VERSION=$1
if [ -z "$VERSION" ]; then
Expand Down
2 changes: 1 addition & 1 deletion bin/client_package_standalone
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [[ ! "$OS" =~ ^(linux|darwin|windows)$ ]]; then
exit 1
fi

BINARY=${BINARY:="build/client/mysterium_client"}
BINARY=${BINARY:-"build/client/mysterium_client"}
DIR_BUILD="build/package"

# Put all files to package directory (to avoid preserving directory structure)
Expand Down
4 changes: 2 additions & 2 deletions bin/server_build
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

source bin/helpers/functions.sh

export GOOS=${GOOS:=`go env GOHOSTOS`}
export GOARCH=${GOARCH:=`go env GOHOSTARCH`}
export GOOS=${GOOS:-`go env GOHOSTOS`}
export GOARCH=${GOARCH:-`go env GOHOSTARCH`}
export GOBIN=`pwd`/build/server
echo "Compiling 'mysterium_server' for '$GOOS/$GOARCH'.."

Expand Down
2 changes: 1 addition & 1 deletion bin/server_package_debian
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OS_DIR_CONFIG="/etc/mysterium-node"
OS_DIR_DOC="/usr/share/doc/mysterium-node"
OS_DIR_INSTALLATION="/usr/lib/mysterium-node/installation"
OS_DIR_SUDOERS="/etc/sudoers.d"
BINARY=${BINARY:="build/server/mysterium_server"}
BINARY=${BINARY:-"build/server/mysterium_server"}

VERSION=$1
if [ -z "$VERSION" ]; then
Expand Down
2 changes: 1 addition & 1 deletion bin/server_package_standalone
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [[ ! "$OS" =~ ^(linux|darwin|windows)$ ]]; then
exit 1
fi

BINARY=${BINARY:="build/server/mysterium_server"}
BINARY=${BINARY:-"build/server/mysterium_server"}
DIR_BUILD="build/package"

# Put all files to package directory (to avoid preserving directory structure)
Expand Down

0 comments on commit d0bcee1

Please sign in to comment.