Fixed script strings.

CelliesProjects · Nov 1, 2019 · fb26627 · fb26627
1 parent 1dee3b9
commit fb26627
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/compile.sh b/compile.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 if [ $(grep GIT_TAG deviceSetup.h | grep -ic TRUE) != "1" ]
 then
-  echo -e '\e[31m'ERROR'\e[0m' GIT_TAG not set to true in deviceSetup.h.
+  echo -e "\e[31mERROR\e[0m GIT_TAG not set to true in deviceSetup.h."
   exit 1
 fi
 currentVersion=""
@@ -12,6 +12,6 @@ else
   currentVersion=$(git branch | grep \* | cut -d ' ' -f2):$(git rev-parse --short HEAD)
 fi
 echo "const char * sketchVersion = \"$currentVersion\";" > gitTagVersion.h
-echo -e Compiling aquacontrol32 version: '\e[36m'$currentVersion'\e[0m'
+echo -e "Compiling aquacontrol32 version: \e[36m$currentVersion\e[0m"
 ~/arduino-1.8.10/arduino --board espressif:esp32:mhetesp32minikit --pref custom_DebugLevel=esp32_none --port /dev/ttyUSB0 --pref upload.speed=921600 --preserve-temp-files --pref build.path=temp --pref build.partitions=default_ffat --pref build.flash_freq=80m -v --verify aquacontrol32.ino | grep  -e 'Using core' -e 'Using board' -e ' uses ' -e 'Using library' -e 'Compiling' -e 'Global'
 rm gitTagVersion.h
diff --git a/debug.sh b/debug.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 if [ $(grep GIT_TAG deviceSetup.h | grep -ic TRUE) != "1" ]
 then
-  echo -e '\e[31m'ERROR'\e[0m' GIT_TAG not set to true in deviceSetup.h.
+  echo -e "\e[31mERROR\e[0m GIT_TAG not set to true in deviceSetup.h."
   exit 1
 fi
 currentVersion=""
@@ -11,8 +11,8 @@ then
 else
   currentVersion=$(git branch | grep \* | cut -d ' ' -f2):$(git rev-parse --short HEAD)
 fi
-currentVersion+='!debug'
+currentVersion+="!debug"
 echo "const char * sketchVersion = \"$currentVersion\";" > gitTagVersion.h
-echo -e Compiling and flashing aquacontrol32 version: '\e[36m'$currentVersion'\e[0m'
+echo -e "Compiling and flashing aquacontrol32 version: \e[36m$currentVersion\e[0m"
 ~/arduino-1.8.10/arduino --board espressif:esp32:esp32 --pref custom_DebugLevel=esp32_info --port /dev/ttyUSB0 --pref upload.speed=921600 --preserve-temp-files --pref build.path=temp --pref build.partitions=default_ffat --pref build.flash_freq=80m -v --upload aquacontrol32.ino | grep  -e 'Using core' -e 'Using board' -e ' uses ' -e 'Using library' -e 'Compiling' -e 'Global'
 rm gitTagVersion.h
diff --git a/flash.sh b/flash.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 if [ $(grep GIT_TAG deviceSetup.h | grep -ic TRUE) != "1" ]
 then
-  echo -e '\e[31m'ERROR'\e[0m' GIT_TAG not set to true in deviceSetup.h.
+  echo -e "\e[31mERROR\e[0m GIT_TAG not set to true in deviceSetup.h."
   exit 1
 fi
 currentVersion=""
@@ -12,6 +12,6 @@ else
   currentVersion=$(git branch | grep \* | cut -d ' ' -f2):$(git rev-parse --short HEAD)
 fi
 echo "const char * sketchVersion = \"$currentVersion\";" > gitTagVersion.h
-echo -e Compiling and flashing aquacontrol32 version: '\e[36m'$currentVersion'\e[0m'
+echo -e "Compiling and flashing aquacontrol32 version: \e[36m$currentVersion\e[0m"
 ~/arduino-1.8.10/arduino --board espressif:esp32:mhetesp32minikit --pref custom_DebugLevel=esp32_none --port /dev/ttyUSB0 --pref upload.speed=921600 --preserve-temp-files --pref build.path=temp --pref build.partitions=default_ffat --pref build.flash_freq=80m -v --upload aquacontrol32.ino | grep  -e 'Using core' -e 'Using board' -e ' uses ' -e 'Using library' -e 'Compiling' -e 'Global'
 rm gitTagVersion.h