Reworked into bash array to prevent issues when setting watchfaces :-)

Author: Thulium-Drake

docker/build.sh

@@ -77,17 +77,9 @@ GetNrfSdk() {
 }
 
 CmakeGenerate() {
-  CMAKE_ARGS=''
-
-  if [ -n "$ENABLE_USERAPPS" ]
-  then
-    CMAKE_ARGS="-DENABLE_USERAPPS=$ENABLE_USERAPPS"
-  fi
-
-  if [ -n "$ENABLE_WATCHFACES" ]
-  then
-    CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_WATCHFACES=$ENABLE_WATCHFACES"
-  fi
+  CMAKE_ARGS=()
+  [ -n "$ENABLE_USERAPPS" ]  && CMAKE_ARGS+=("-DENABLE_USERAPPS=$ENABLE_USERAPPS")
+  [ -n "$ENABLE_WATCHFACES" ] && CMAKE_ARGS+=("-DENABLE_WATCHFACES=$ENABLE_WATCHFACES")
 
   cmake -G "Unix Makefiles" \
     -S "$SOURCES_DIR" \
@@ -97,7 +89,7 @@ CmakeGenerate() {
     -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
     -DBUILD_DFU=1 \
     -DBUILD_RESOURCES=1 \
-    $CMAKE_ARGS
+    ${CMAKE_ARGS[@]}
 }
 
 CmakeBuild() {