fix: search indexing window staying open during install

Author: RadNotRed

src/playbook/Executables/AtlasDesktop/3. General Configuration/Search Indexing/Disable Search Indexing.cmd

@@ -4,8 +4,11 @@ set "stateValue=0"
 set "scriptPath=%~f0"
 set indexConfPath="%windir%\AtlasModules\Scripts\indexConf.cmd"
 set "silentMode=0"
-
-echo %* | findstr /i /c:"/silent" /c:"-silent" /c:"/quiet" > nul 2>&1 && set "silentMode=1"
+for %%a in (%*) do (
+    if /I "%%a"=="/silent" set "silentMode=1"
+    if /I "%%a"=="-silent" set "silentMode=1"
+    if /I "%%a"=="/quiet" set "silentMode=1"
+)
 
 if "%silentMode%"=="1" (
     fltmc > nul 2>&1 || (
@@ -20,8 +23,10 @@ if "%silentMode%"=="1" (
 )
 
 if not exist "%indexConfPath%" (
-    echo The 'indexConf.cmd' script wasn't found in AtlasModules.
-    pause
+    if "%silentMode%"=="0" (
+        echo The 'indexConf.cmd' script wasn't found in AtlasModules.
+        pause
+    )
     exit /b 1
 )
 set "indexConf=call %indexConfPath%"

src/playbook/Executables/AtlasDesktop/3. General Configuration/Search Indexing/Enable Search Indexing.cmd

@@ -4,8 +4,11 @@ set "stateValue=2"
 set "scriptPath=%~f0"
 set indexConfPath="%windir%\AtlasModules\Scripts\indexConf.cmd"
 set "silentMode=0"
-
-echo %* | findstr /i /c:"/silent" /c:"-silent" /c:"/quiet" > nul 2>&1 && set "silentMode=1"
+for %%a in (%*) do (
+    if /I "%%a"=="/silent" set "silentMode=1"
+    if /I "%%a"=="-silent" set "silentMode=1"
+    if /I "%%a"=="/quiet" set "silentMode=1"
+)
 
 if "%silentMode%"=="1" (
     fltmc > nul 2>&1 || (
@@ -20,8 +23,10 @@ if "%silentMode%"=="1" (
 )
 
 if not exist "%indexConfPath%" (
-    echo The 'indexConf.cmd' script wasn't found in AtlasModules.
-    pause
+    if "%silentMode%"=="0" (
+        echo The 'indexConf.cmd' script wasn't found in AtlasModules.
+        pause
+    )
     exit /b 1
 )
 set "indexConf=call %indexConfPath%"

src/playbook/Executables/AtlasDesktop/3. General Configuration/Search Indexing/Minimal Search Indexing (default).cmd

@@ -4,8 +4,11 @@ set "stateValue=1"
 set "scriptPath=%~f0"
 set indexConfPath="%windir%\AtlasModules\Scripts\indexConf.cmd"
 set "silentMode=0"
-
-echo %* | findstr /i /c:"/silent" /c:"-silent" /c:"/quiet" > nul 2>&1 && set "silentMode=1"
+for %%a in (%*) do (
+    if /I "%%a"=="/silent" set "silentMode=1"
+    if /I "%%a"=="-silent" set "silentMode=1"
+    if /I "%%a"=="/quiet" set "silentMode=1"
+)
 
 if "%silentMode%"=="1" (
     fltmc > nul 2>&1 || (
@@ -20,9 +23,10 @@ if "%silentMode%"=="1" (
 )
 
 if not exist "%indexConfPath%" (
-    echo The 'indexConf.cmd' script wasn't found in AtlasModules.
-    if "%silentMode%"=="1" exit /b 1
-    pause
+    if "%silentMode%"=="0" (
+        echo The 'indexConf.cmd' script wasn't found in AtlasModules.
+        pause
+    )
     exit /b 1
 )
 set "indexConf=call %indexConfPath%"

src/playbook/Executables/AtlasModules/Scripts/indexConf.cmd

@@ -38,7 +38,7 @@ if "%~1"=="/start" (
     %___settings% /unhide cortana-windowssearch
 
     echo Updating policy... ^(this might take a moment^)
-    gpupdate > nul
+    gpupdate /force /wait:0 > nul 2>&1
 )
 
 if "%~1"=="/stop" (
@@ -47,7 +47,7 @@ if "%~1"=="/stop" (
     %___settings% /hide cortana-windowssearch
 
     rem Kill the search index Control Panel pane
-    powershell -NoP -NonI -C "Stop-Process -Id (gcim Win32_Process | ? { $_.CommandLine -match 'srchadmin.dll' }).ProcessId -Force"
+    powershell -NoP -NonI -C "Get-Process | Where-Object { $_.MainWindowTitle -like '*Indexing Options*' -or $_.CommandLine -match 'srchadmin.dll' } | Stop-Process -Force -ErrorAction SilentlyContinue"
 
     sc config WSearch start=disabled > nul
     sc stop WSearch > nul 2>&1