diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-04-03 10:21:17 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-04-03 10:21:17 -0300 |
| commit | ff97b87b8a5a547ae31dd8fde14cc2d60482e7e8 (patch) | |
| tree | 18988899ce865d0932bcf9db3fddb64f7723790d | |
| parent | c0c3d4170833bc111841cc0f4f1ed97283574942 (diff) | |
| parent | 7f3617a58d30feb9d26828efeb2f75516fea0a64 (diff) | |
| download | mullvadvpn-ff97b87b8a5a547ae31dd8fde14cc2d60482e7e8.tar.xz mullvadvpn-ff97b87b8a5a547ae31dd8fde14cc2d60482e7e8.zip | |
Merge branch 'fix-env-sh'
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | env.sh | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -17,7 +17,7 @@ RUSTC_VERSION=`rustc +stable --version` PRODUCT_VERSION=$(node -p "require('./gui/package.json').version" | sed -Ee 's/\.0//g') CARGO_TARGET_DIR=${CARGO_TARGET_DIR:-"$SCRIPT_DIR/target"} -source env.sh +source env.sh "" if [[ "${1:-""}" != "--dev-build" ]]; then if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then @@ -4,6 +4,8 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ -n "$1" ]; then PLATFORM="$1" +else + PLATFORM="" fi if [ -z "$PLATFORM" ]; then |
