Merge branch 'fix-env-and-build-scripts'

2 files changed, 2 insertions, 1 deletions

diff --git a/build.sh b/build.sh
index d3fb28a721..9dea5fbedf 100755
--- a/build.sh
+++ b/build.sh
@@ -14,6 +14,7 @@ set -eu
 SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
 RUSTC_VERSION=`rustc +stable --version`
 PRODUCT_VERSION=$(node -p "require('./package.json').version" | sed -Ee 's/\.0//g')
+source env.sh
 
 if [[ "${1:-""}" != "--dev-build" ]]; then
 
diff --git a/env.sh b/env.sh
index 1889f1ee71..1f1b5b10b2 100644
--- a/env.sh
+++ b/env.sh
@@ -1,6 +1,6 @@
 # Sourcing this file should set up the environment to build the app
 
-SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 case "$(uname -s)" in
   Linux*)