From fda391a7534966b4aae9dc56e52da5cfd6aa1203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 18 Feb 2025 11:00:08 +0200 Subject: [PATCH] Provisioning: Allow retry when disabling spotlight indexing Task-number: QTQAINFRA-5996 Change-Id: I05ef6d33d74448ee830d137b137c6ee73f6e0518 Reviewed-by: Ville-Pekka Karhu --- coin/provisioning/common/macos/disable_spotlight.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/macos/disable_spotlight.sh b/coin/provisioning/common/macos/disable_spotlight.sh index b4907ca0..bc3a2c85 100755 --- a/coin/provisioning/common/macos/disable_spotlight.sh +++ b/coin/provisioning/common/macos/disable_spotlight.sh @@ -2,14 +2,17 @@ # Copyright (C) 2017 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +# Allow retry in case mdutil fails with first tries +set +e + disableSpotlight() { # Disable spotlight and and stop indexing - sudo mdutil -a -i off - sudo mdutil -a -i off / + sudo mdutil -a -i off || return 1 + sudo mdutil -a -i off / || return 1 # Disable spotlight indexing /Volumes - sudo mdutil -i off /Volumes + sudo mdutil -i off /Volumes || return 1 # Erase spotlight index - sudo mdutil -E / + sudo mdutil -E / || return 1 } # Disabling spotlight tends to be flaky, add some retry