Merge pull request #163 from smartobjectoriented/162-regression-in-so3usr-buildsh

Author: AndreCostaaa

usr/build.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-function usage {
+usage() {
   echo "$0 [OPTIONS]"
   echo "  -c        Clean"
   echo "  -r        Release build"
@@ -11,23 +11,23 @@ function usage {
   echo "  -h        Print this help"
 }
 
-function install_file_elf {
+install_file_elf() {
   if [ -f $1 ] ; then 
     for subfolder_app in $(find build/src -type f -iname "*.elf"); do
       mv "$subfolder_app" build/deploy
     done
   fi
 }
 
-function install_file_root {
+install_file_root() {
   [ -f $1 ] && echo "Installing $1" && cp $1 build/deploy
 }
 
-function install_directory_root {
+install_directory_root() {
   [ -d $1 ] && cp -R $1 build/deploy
 }
 
-function install_file_directory {
+install_file_directory() {
   [ -f $1 ] && echo "Installing $1 into $2" && mkdir -p build/deploy/$2 && cp $1 build/deploy/$2
 }
 
@@ -61,10 +61,10 @@ ORIGINAL_WD=$(pwd)
 SCRIPT=$(readlink -f $0)
 SCRIPTPATH=`dirname $SCRIPT`
 
-if [ $clean == y ]; then
+if [ $clean = y ]; then
   echo "Cleaning $SCRIPTPATH/build"
   rm -rf $SCRIPTPATH/build
-  if [ "$PLATFORM" == "virt64" ]; then
+  if [ "$PLATFORM" = "virt64" ]; then
     echo "Cleaning microPython"
     cd src/micropython/ports/soo
     make clean
@@ -73,7 +73,7 @@ if [ $clean == y ]; then
   exit
 fi
 
-if [ $debug == y ]; then
+if [ $debug = y ]; then
   build_type="Debug"
 else
   build_type="Release"
@@ -84,9 +84,9 @@ mkdir -p $SCRIPTPATH/build
 
 cd $SCRIPTPATH/build
 
-if [ "$PLATFORM" == "virt32" -o "$PLATFORM" == "vexpress" -o "$PLATFORM" == "rpi4" ]; then
+if [ "$PLATFORM" = "virt32" -o "$PLATFORM" = "vexpress" -o "$PLATFORM" = "rpi4" ]; then
   default_toolchain="arm_toolchain.cmake"
-elif [ "$PLATFORM" == "virt64" -o "$PLATFORM" == "rpi4_64" ]; then
+elif [ "$PLATFORM" = "virt64" -o "$PLATFORM" = "rpi4_64" ]; then
   default_toolchain="aarch64_toolchain.cmake"
 elif [ -z "$USR_BUILD_TOOLCHAIN_FILE" ]; then
   # Only fail if no custom toolchain is provided
@@ -100,13 +100,13 @@ toolchain_file="${USR_BUILD_TOOLCHAIN_FILE:-$default_toolchain}"
 # Run cmake with the selected toolchain
 cmake -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=$build_type -DCMAKE_TOOLCHAIN_FILE=../"$toolchain_file" ..
 
-if [ $singlecore == y ]; then
+if [ $singlecore = y ]; then
   NRPROC=1
 else
   NRPROC=$(nproc)
 fi
 
-if [ $verbose == y ]; then
+if [ $verbose = y ]; then
 	make VERBOSE=1 -j1
 else
 	make -j$NRPROC