From 50f99319f4f15a220baa4043a4bddb2e9643fc0d Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Wed, 21 Oct 2020 16:09:53 +0300 Subject: [PATCH 1/7] add spotlight reindex --- images/macos/provision/configuration/finalize-vm.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index b01b3c23..b2e831c8 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -17,4 +17,9 @@ cp $HOME/image-generation/output/software-report/systeminfo.txt $HOME/image-gene npm cache clean --force # Clean up temporary directories -rm -rf ~/utils ~/image-generation \ No newline at end of file +rm -rf ~/utils ~/image-generation + +# Erase all indexes and wait until the rebuilding process ends, +# for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish +sudo mdutil -E / +sleep 180 \ No newline at end of file From 7776bc4f83f6272d1728cc8deeda980a532cddff Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 22 Oct 2020 14:44:40 +0300 Subject: [PATCH 2/7] removed timeout --- images/macos/provision/configuration/finalize-vm.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index b2e831c8..236fb526 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -22,4 +22,10 @@ rm -rf ~/utils ~/image-generation # Erase all indexes and wait until the rebuilding process ends, # for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish sudo mdutil -E / -sleep 180 \ No newline at end of file + +sudo log stream | while true; do + if read -rt5 && [[ $REPLY =~ "executeQuery with success=0" ]]; then + echo "indexing completed" + exit 0 + fi +done \ No newline at end of file From 6b4ca3cc7f2621db30da300cff4bec25686f6fe8 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 22 Oct 2020 15:02:41 +0300 Subject: [PATCH 3/7] typo --- images/macos/provision/configuration/finalize-vm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index 236fb526..f45de873 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -26,6 +26,6 @@ sudo mdutil -E / sudo log stream | while true; do if read -rt5 && [[ $REPLY =~ "executeQuery with success=0" ]]; then echo "indexing completed" - exit 0 + exit 0 fi done \ No newline at end of file From 67fb0904b7b54306656f2380d5f786ce42b3c496 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 23 Oct 2020 13:30:51 +0300 Subject: [PATCH 4/7] changed a log message --- images/macos/provision/configuration/finalize-vm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index f45de873..bdabc50b 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -24,7 +24,7 @@ rm -rf ~/utils ~/image-generation sudo mdutil -E / sudo log stream | while true; do - if read -rt5 && [[ $REPLY =~ "executeQuery with success=0" ]]; then + if read -rt5 && [[ $REPLY =~ "Unlinked journal" ]]; then echo "indexing completed" exit 0 fi From 81941077a178d7ee4af97bdbacd8f435ecbc76e4 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Wed, 28 Oct 2020 16:15:33 +0300 Subject: [PATCH 5/7] changed stop message --- images/macos/provision/configuration/finalize-vm.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index 2ce313a7..90ffbbeb 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -26,10 +26,5 @@ rm -rf ~/utils ~/image-generation # Erase all indexes and wait until the rebuilding process ends, # for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish sudo mdutil -E / - -sudo log stream | while true; do - if read -rt5 && [[ $REPLY =~ "Unlinked journal" ]]; then - echo "indexing completed" - exit 0 - fi -done \ No newline at end of file +sudo log stream | grep -q -E 'mds.*Released.*BackgroundTask' +echo "Indexing completed" \ No newline at end of file From 62de6fab8b176ae27fb8263a927d26ae7a4a768c Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Wed, 28 Oct 2020 16:39:42 +0300 Subject: [PATCH 6/7] pipx linter change --- images/macos/provision/core/pipx-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/provision/core/pipx-packages.sh b/images/macos/provision/core/pipx-packages.sh index 658600fa..a101d6d7 100644 --- a/images/macos/provision/core/pipx-packages.sh +++ b/images/macos/provision/core/pipx-packages.sh @@ -1,3 +1,5 @@ +#!/bin/bash -e -o pipefail + source ~/utils/utils.sh export PATH="$PATH:/opt/pipx_bin" From 02e3c4276dfbeaf7709bf230357f09bb12dcc96f Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 29 Oct 2020 09:19:29 +0300 Subject: [PATCH 7/7] exit with true because of pipefail --- images/macos/provision/configuration/finalize-vm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index 3e73dc5f..ef4a3714 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -29,5 +29,5 @@ rm -rf ~/utils ~/image-generation # Erase all indexes and wait until the rebuilding process ends, # for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish sudo mdutil -E / -sudo log stream | grep -q -E 'mds.*Released.*BackgroundTask' +sudo log stream | grep -q -E 'mds.*Released.*BackgroundTask' || true echo "Indexing completed" \ No newline at end of file