@@ -10,40 +10,38 @@ function build {
10
10
local chunks_cnt=$3
11
11
local build_log=$4
12
12
local sketches_file=$5
13
- shift ; shift ; shift ; shift ; shift ;
14
- local sketches=$*
13
+ shift 5
14
+ local sketches=( " $@ " )
15
15
16
16
local BUILD_SKETCH=" ${SCRIPTS_DIR} /sketch_utils.sh build"
17
17
local BUILD_SKETCHES=" ${SCRIPTS_DIR} /sketch_utils.sh chunk_build"
18
18
19
- local args=" -ai $ARDUINO_IDE_PATH -au $ARDUINO_USR_PATH "
20
-
21
- args+=" -t $target "
19
+ local args=(" -ai" " $ARDUINO_IDE_PATH " " -au" " $ARDUINO_USR_PATH " " -t" " $target " )
22
20
23
21
if [ " $OS_IS_LINUX " == " 1" ]; then
24
- args+=" -p $ARDUINO_ESP32_PATH /libraries"
25
- args+=" -i $chunk_index -m $chunks_cnt "
22
+ args+=(" -p" " $ARDUINO_ESP32_PATH /libraries" " -i" " $chunk_index " " -m" " $chunks_cnt " )
26
23
if [ -n " $sketches_file " ]; then
27
- args+=" -f $sketches_file "
24
+ args+=( " -f " " $sketches_file " )
28
25
fi
29
26
if [ " $build_log " -eq 1 ]; then
30
- args+=" -l $build_log "
27
+ args+=( " -l " " $build_log " )
31
28
fi
32
- ${BUILD_SKETCHES} " ${args} "
29
+ " ${BUILD_SKETCHES} " " ${args[@] } "
33
30
else
34
- for sketch in ${sketches} ; do
35
- local sargs
31
+ for sketch in " ${sketches[@]} " ; do
32
+ local sargs=( " ${args[@]} " )
36
33
local ctags_version
37
34
local preprocessor_version
38
- sargs= " $args -s $( dirname " $sketch " ) "
35
+ sargs+=( " -s " " $( dirname " $sketch " ) " )
39
36
if [ " $OS_IS_WINDOWS " == " 1" ] && [ -d " $ARDUINO_IDE_PATH /tools-builder" ]; then
40
37
ctags_version=$( ls " $ARDUINO_IDE_PATH /tools-builder/ctags/" )
41
38
preprocessor_version=$( ls " $ARDUINO_IDE_PATH /tools-builder/arduino-preprocessor/" )
42
- win_opts=" -prefs=runtime.tools.ctags.path=$ARDUINO_IDE_PATH /tools-builder/ctags/$ctags_version
43
- -prefs=runtime.tools.arduino-preprocessor.path=$ARDUINO_IDE_PATH /tools-builder/arduino-preprocessor/$preprocessor_version "
44
- sargs+=" ${win_opts} "
39
+ sargs+=(
40
+ " -prefs=runtime.tools.ctags.path=$ARDUINO_IDE_PATH /tools-builder/ctags/$ctags_version "
41
+ " -prefs=runtime.tools.arduino-preprocessor.path=$ARDUINO_IDE_PATH /tools-builder/arduino-preprocessor/$preprocessor_version "
42
+ )
45
43
fi
46
- ${BUILD_SKETCH} " ${sargs} "
44
+ " ${BUILD_SKETCH} " " ${sargs[@] } "
47
45
done
48
46
fi
49
47
}
0 commit comments