From ed3778c4fa5c6a29651cd3394237e5bf9449f482 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Fri, 29 Jan 2021 19:09:28 +0100 Subject: [PATCH] . --- scripts/autoconfig-all.cmd | 8 +++++--- scripts/cleanup-startmenu.cmd | 10 +++++----- scripts/cleanup-tiles.ps1 | 13 ++++++++----- scripts/deploy/logon.cmd | 4 ++++ scripts/install-git.cmd | 4 ++-- scripts/install-purebasic.cmd | 4 ++-- scripts/uninstall-edge.cmd | 1 + wim/remove-packages.cmd | 17 ++++++++--------- 8 files changed, 35 insertions(+), 26 deletions(-) diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd index 51b0ba2..1d68ed3 100644 --- a/scripts/autoconfig-all.cmd +++ b/scripts/autoconfig-all.cmd @@ -14,9 +14,11 @@ mkdir %T% 1>nul 2>nul echo cd to %SCRIPTS% ... cd /D %SCRIPTS% -echo moving files in deploy folder to %TOOLS% ... -move /Y deploy\* %TOOLS% -rmdir deploy 1>nul 2>nul +echo copy files in deploy folder to %TOOLS% ... +if EXIST deploy ( + move /Y deploy\* %TOOLS% 2>nul + rmdir deploy 2>nul +) echo. echo ####################### diff --git a/scripts/cleanup-startmenu.cmd b/scripts/cleanup-startmenu.cmd index 6fd6fcc..54b4c1a 100644 --- a/scripts/cleanup-startmenu.cmd +++ b/scripts/cleanup-startmenu.cmd @@ -3,9 +3,9 @@ echo ####### %0 ####### echo kill system processes and wait a short time ... -taskkill /f /im StartMenuExperienceHost.exe -taskkill /f /im shellexperiencehost.exe -taskkill /f /im explorer.exe +taskkill /f /im StartMenuExperienceHost.exe 2>nul +taskkill /f /im shellexperiencehost.exe 2>nul +taskkill /f /im explorer.exe 2>nul ping 127.0.0.1 -n 3 >nul 2>nul @@ -15,8 +15,8 @@ del %LOCALAPPDATA%\Packages\Microsoft.Windows.ShellExperienceHost_cw5n1h2txyewy\ REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\ImmersiveShell\StateStore" /V ResetCache /T REG_DWORD /D 1 /F echo start explorer again ... -ping 127.0.0.1 -n 1 >nul 2>nul -start explorer +ping 127.0.0.1 -n 3 >nul 2>nul +start explorer.exe echo ####### %0 ####### diff --git a/scripts/cleanup-tiles.ps1 b/scripts/cleanup-tiles.ps1 index 1ff5256..c59694c 100644 --- a/scripts/cleanup-tiles.ps1 +++ b/scripts/cleanup-tiles.ps1 @@ -40,12 +40,13 @@ foreach ($regAlias in $regAliases) { # restart Explorer, open the start menu (necessary to load the new layout), # and give it a few seconds to process ... -Start-Sleep -s 3 echo "restart explorer ..." -Stop-Process -name explorer -Start-Sleep -s 3 +taskkill /F /IM explorer.exe +sleep 3 +start explorer.exe +sleep 3 $wshell = New-Object -ComObject wscript.shell; $wshell.SendKeys('^{ESCAPE}') -Start-Sleep -s 3 +sleep 3 # enable the ability to pin items again by disabling "LockedStartLayout" ... foreach ($regAlias in $regAliases) { @@ -56,8 +57,10 @@ foreach ($regAlias in $regAliases) { # restart Explorer and delete the layout file ... echo "restart explorer ..." -Stop-Process -name explorer +taskkill /F /IM explorer.exe +sleep 3 Remove-Item $LAYOUT +start explorer.exe write-host '#######',(split-path $PSCommandPath -Leaf),'#######' diff --git a/scripts/deploy/logon.cmd b/scripts/deploy/logon.cmd index f06b426..5106500 100644 --- a/scripts/deploy/logon.cmd +++ b/scripts/deploy/logon.cmd @@ -54,6 +54,10 @@ if NOT EXIST %windir%\wcx_ftp.ini ( rem ### rem ###### +rem deleting useless files ... +del /F "$APPDATA%\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk" 1>nul 2>nul +del /F "%APPDATA%\Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk" 1>nul 2>nul +del /F "%USERPROFILE%\Desktop\Microsoft Edge.lnk" 1>nul 2>nul echo start workstation service ... net start workstation 1>nul 2>nul diff --git a/scripts/install-git.cmd b/scripts/install-git.cmd index 646e252..28aca42 100644 --- a/scripts/install-git.cmd +++ b/scripts/install-git.cmd @@ -7,8 +7,8 @@ set TOOLS=c:\tools echo ####### %0 ####### echo killing ssh processes... -taskkill /F /IM ssh-agent.exe -taskkill /F /IM ssh.exe +taskkill /F /IM ssh-agent.exe 2>nul +taskkill /F /IM ssh.exe 2>nul echo installing GIT ... %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS diff --git a/scripts/install-purebasic.cmd b/scripts/install-purebasic.cmd index c021cc6..ba56755 100644 --- a/scripts/install-purebasic.cmd +++ b/scripts/install-purebasic.cmd @@ -6,8 +6,8 @@ set EXE=..\software\PureBasic_Windows_X64_LTS_5.73.exe echo ####### %0 ####### echo killing ssh processes... -taskkill /F /IM PureBasic.exe -taskkill /F /IM pbcompiler.exe +taskkill /F /IM PureBasic.exe 2>nul +taskkill /F /IM pbcompiler.exe 2>nul echo installing PUREBASIC ... %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS diff --git a/scripts/uninstall-edge.cmd b/scripts/uninstall-edge.cmd index 5edfc8c..33f6845 100644 --- a/scripts/uninstall-edge.cmd +++ b/scripts/uninstall-edge.cmd @@ -15,6 +15,7 @@ del /F "%PUBLIC%\Desktop\Microsoft Edge.lnk" 2>nul del /F "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk" 2>nul del /F "%APPDATA%\Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk" 2>nul del /F "%USERPROFILE%\Desktop\Microsoft Edge.lnk" 2>nul +rd /S /Q "%PROGRAMDATA%\Microsoft\EdgeUpdate" 2>nul echo block edge updates ... reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\EdgeUpdate" ^ diff --git a/wim/remove-packages.cmd b/wim/remove-packages.cmd index 19a0b77..809e04e 100644 --- a/wim/remove-packages.cmd +++ b/wim/remove-packages.cmd @@ -165,6 +165,14 @@ for %%P in ( Microsoft-Windows-WPD-UltimatePortableDeviceFeature-Feature Microsoft-Windows-Xps Microsoft-Xbox + microsoft-onecore-applicationmodel + Microsoft-OneCore-ApplicationModel + Microsoft-OneCore-IsolatedUserMode + Microsoft-OneCore-Multimedia-CastingCommon + Microsoft-OneCore-Multimedia-CastingReceiver + Microsoft-OneCore-VirtualizationBasedSecurity + Microsoft-OneCore-Multimedia-CastingTransmitter-Media-Package + Microsoft-Onecore-SPP-VirtualDevice MSMQ-Driver-Package MultiPoint Networking-MPSSVC-Rules-EnterpriseEdition-Package @@ -175,15 +183,6 @@ for %%P in ( Server-Help Windows-Defender WindowsSearchEngineSKU-Group - microsoft-onecore-applicationmodel - Microsoft-OneCore-ApplicationModel - Microsoft-OneCore-IsolatedUserMode - Microsoft-OneCore-Multimedia-CastingCommon - Microsoft-OneCore-Multimedia-CastingReceiver - Microsoft-OneCore-VirtualizationBasedSecurity - Microsoft-OneCoreUAP-AppRuntime - Microsoft-OneCore-Multimedia-CastingTransmitter-Media-Package - Microsoft-Onecore-SPP-VirtualDevice ) do (