From ecd28383026d9e665a6571abdba604b81c9a8742 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 27 Oct 2019 16:11:52 +0100
Subject: [PATCH] make so it can run from outside scripts directory

---
 scripts/build.sh | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index d07a51e09..750ad6113 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -11,16 +11,13 @@ is_git() {
 }
 
 stat_bytes() {
-    echo "size is:"
-    case "$(uname -s)" in
-        Darwin) stat -f %z "$1";;
-        *) stat -c %s "$1";;
-    esac
+	filesize=`du -k "$1" | cut -f1;`
+	echo 'size:' $filesize 'bytes'
 }
 
 # Available environments
 list_envs() {
-    grep env: ../platformio.ini | sed 's/\[env:\(.*\)\]/\1/g'
+    grep env: platformio.ini | sed 's/\[env:\(.*\)\]/\1/g'
 }
 
 print_available() {
@@ -59,7 +56,7 @@ set_default_environments() {
 }
 
 build_webui() {
-    cd ../tools/webfilesbuilder
+    cd ./tools/webfilesbuilder
 
     # Build system uses gulpscript.js to build web interface
     if [ ! -e node_modules/gulp/bin/gulp.js ]; then
@@ -73,12 +70,6 @@ build_webui() {
     echo "Building web interface..."
     node node_modules/gulp/bin/gulp.js || exit
 
-    # TODO: do something if webui files are different
-    # for now, just print in travis log
-    if ${TRAVIS:-false}; then
-        git --no-pager diff --stat
-    fi
-
     cd ../..
 }
 
@@ -88,11 +79,10 @@ build_environments() {
     mkdir -p $destination/EMS-ESP-$version
 
     for environment in $environments; do
-        echo -n "* EMS-ESP-$version-$environment.bin --- "
+        echo "* EMS-ESP-$version-$environment.bin"
         platformio run --silent --environment $environment || exit 1
         stat_bytes .pio/build/$environment/firmware.bin
-        [[ "${TRAVIS_BUILD_STAGE_NAME}" = "Test" ]] || \
-            mv .pio/build/$environment/firmware.bin $destination/EMS-ESP-$version/EMS-ESP-$version-$environment.bin
+        mv .pio/build/$environment/firmware.bin $destination/EMS-ESP-$version/EMS-ESP-$version-$environment.bin
     done
     echo "--------------------------------------------------------------" 
 }
@@ -101,7 +91,7 @@ build_environments() {
 ####### MAIN
 
 destination=firmware
-version_file=../src/version.h
+version_file=./src/version.h
 version=$(grep -E '^#define APP_VERSION' $version_file | awk '{print $3}' | sed 's/"//g')
 
 if ${TRAVIS:-false}; then
@@ -115,6 +105,8 @@ else
     git_tag=
 fi
 
+echo $git_tag
+
 if [[ -n $git_tag ]]; then
     new_version=${version/-*}
     sed -i -e "s@$version@$new_version@" $version_file
@@ -183,7 +175,7 @@ fi
 # for debugging
 echo "* git_revision = $git_revision"
 echo "* git_tag = $git_tag"
-echo "* TRAVIS_EVENT_TYPE = $TRAVIS_EVENT_TYPE"
+echo "* TRAVIS_COMMIT = $TRAVIS_COMMIT"
 echo "* TRAVIS_TAG = $TRAVIS_TAG"
 echo "* TRAVIS_BRANCH = $TRAVIS_BRANCH"
 echo "* TRAVIS_BUILD_STAGE_NAME = $TRAVIS_BUILD_STAGE_NAME"