1 files changed, 16 insertions, 16 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh
index 129622b522..f398a1a1cc 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -7,10 +7,11 @@ build_make() {
 }
 
 build_deps() {
-  if [[ "${BUILD_32BIT}" == ON ]]; then
+  if test "${BUILD_32BIT}" = ON ; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
   fi
-  if [[ "${FUNCTIONALTEST}" == "functionaltest-lua" ]]; then
+  if test "${FUNCTIONALTEST}" = "functionaltest-lua" \
+     || test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON"
   fi
 
@@ -18,16 +19,15 @@ build_deps() {
 
   # If there is a valid cache and we're not forced to recompile,
   # use cached third-party dependencies.
-  if [[ -f "${CACHE_MARKER}" ]] && [[ "${BUILD_NVIM_DEPS}" != true ]]; then
-    if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-      local statcmd="stat -f '%Sm'"
-    else
-      local statcmd="stat -c '%y'"
+  if test -f "${CACHE_MARKER}" && test "${BUILD_NVIM_DEPS}" != "true" ; then
+    local statcmd="stat -c '%y'"
+    if test "${TRAVIS_OS_NAME}" = osx ; then
+      statcmd="stat -f '%Sm'"
     fi
     echo "Using third-party dependencies from Travis's cache (last updated: $(${statcmd} "${CACHE_MARKER}"))."
 
-     mkdir -p "$(dirname "${DEPS_BUILD_DIR}")"
-     mv "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}"
+    mkdir -p "$(dirname "${DEPS_BUILD_DIR}")"
+    mv "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}"
   else
     mkdir -p "${DEPS_BUILD_DIR}"
   fi
@@ -46,10 +46,10 @@ build_deps() {
 }
 
 prepare_build() {
-  if [[ -n "${CLANG_SANITIZER}" ]]; then
+  if test -n "${CLANG_SANITIZER}" ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
   fi
-  if [[ "${BUILD_32BIT}" == ON ]]; then
+  if test "${BUILD_32BIT}" = ON ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
   fi
 
@@ -61,24 +61,24 @@ prepare_build() {
 
 build_nvim() {
   echo "Building nvim."
-  if ! top_make nvim; then
+  if ! top_make nvim ; then
     exit 1
   fi
 
-  if [ "$CLANG_SANITIZER" != "TSAN" ]; then
+  if test "$CLANG_SANITIZER" != "TSAN" ; then
     echo "Building libnvim."
-    if ! top_make libnvim; then
+    if ! top_make libnvim ; then
       exit 1
     fi
 
     echo "Building nvim-test."
-    if ! top_make nvim-test; then
+    if ! top_make nvim-test ; then
       exit 1
     fi
   fi
 
   # Invoke nvim to trigger *San early.
-  if ! (bin/nvim --version && bin/nvim -u NONE -e -c ':qall'); then
+  if ! (bin/nvim --version && bin/nvim -u NONE -e -c ':qall') ; then
     asan_check "${LOG_DIR}"
     exit 1
   fi