From 7c66c239fd51d08da3dd1adbb3187844cd1df30b Mon Sep 17 00:00:00 2001 From: Luc Date: Sat, 10 Aug 2019 21:24:29 +0200 Subject: [PATCH] Fix sed and add missing parameter in matrix --- .travis.yml | 2 +- command.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54823c99..058a9c02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ before_script: - export PATH="$HOME/arduino_ide:$PATH" script: - - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino $TARGET $PLATFORM $BT $AUTHENTICATION + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino $TARGET $PLATFORM $BT $AUTHENTICATION $FILESYSTEM notifications: email: diff --git a/command.sh b/command.sh index c9181f94..4be76603 100644 --- a/command.sh +++ b/command.sh @@ -7,7 +7,7 @@ function build_sketch() local ide=$3 local bt=$4 local auth=$5 - local filessystem=$6 + local fs=$6 if [[ "$ide" == "arduino" ]]; then @@ -15,18 +15,18 @@ function build_sketch() rm -f $HOME/.arduino15/preferences.txt #be sure everything is enabled by default as reference echo "Authentication is enabled" - sed -i "s/\/\/#define AUTHENTICATION_FEATURE /#define AUTHENTICATION_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h + sed -i "s/\/\/#define AUTHENTICATION_FEATURE/#define AUTHENTICATION_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h echo "Bluetooth is enabled" - sed -i "s/\/\/#define BLUETOOTH_FEATURE /#define BLUETOOTH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h + sed -i "s/\/\/#define BLUETOOTH_FEATURE/#define BLUETOOTH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h if [[ "$bt" == "no" ]]; then echo "Disable Bluetooth" - sed -i "s/#define BLUETOOTH_FEATURE /\/\/#define BLUETOOTH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h + sed -i "s/#define BLUETOOTH_FEATURE/\/\/#define BLUETOOTH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h fi if [[ "$auth" == "no" ]]; then echo "Disable Authentication" - sed -i "s/#define AUTHENTICATION_FEATURE /\/\/#define AUTHENTICATION_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h + sed -i "s/#define AUTHENTICATION_FEATURE/\/\/#define AUTHENTICATION_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h fi if [[ "$target" == "esp32" ]]; then @@ -36,13 +36,13 @@ function build_sketch() echo "setup for esp8266" arduino --board esp8266com:esp8266:generic:eesz=4M3M,xtal=160,FlashMode=dio,FlashFreq=40,sdk=nonosdk221,ip=lm2f,dbg=Disabled,vt=flash,exception=disabled,ssl=basic --save-prefs fi - if [[ "$filessystem" == "SPIFFS" ]]; + if [[ "$6" == "SPIFFS" ]]; then echo "Set Filesystem to SPIFFS" sed -i "s/\/\/#define FILESYSTEM_FEATURE ESP_FAT_FILESYSTEM/#define FILESYSTEM_FEATURE ESP_SPIFFS_FILESYSTEM/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h sed -i "s/\/\/#define FILESYSTEM_FEATURE ESP_LITTLEFS_FILESYSTEM/#define FILESYSTEM_FEATURE ESP_SPIFFS_FILESYSTEM/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h fi - if [[ "$filessystem" == "FAT" ]]; + if [[ "$6" == "FAT" ]]; then echo "Set Filesystem to FAT" sed -i "s/\/\/#define FILESYSTEM_FEATURE ESP_SPIFFS_FILESYSTEM/#define FILESYSTEM_FEATURE ESP_FAT_FILESYSTEM/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h