diff --git a/optional/install-antivir.cmd b/optional/install-antivir.cmd index da4bc42..79d40fd 100644 --- a/optional/install-antivir.cmd +++ b/optional/install-antivir.cmd @@ -10,11 +10,14 @@ if NOT EXIST %EXE% ( echo ####### %0 ####### echo installing F-Secure Anti-Virus ... -%EXE% --silent +start /wait %EXE% echo removing F-Secure desktop link ... del /F "%PUBLIC%\Desktop\F-Secure Anti-Virus.lnk" 2>nul +rem refresh desktop (W10 style) +ie4uinit.exe -show + echo ####### %0 ####### pause diff --git a/optional/install-dbbrowser.cmd b/optional/install-dbbrowser.cmd index 89c9737..0cb0d60 100644 --- a/optional/install-dbbrowser.cmd +++ b/optional/install-dbbrowser.cmd @@ -1,6 +1,6 @@ @echo off -set SCRIPTS=..\scripts +set OPT=..\optional set SOFTWARE=..\software set MSI=dbbrowser-setup.msi @@ -15,11 +15,13 @@ cd %SOFTWARE% @echo on msiexec /i %MSI% /passive @echo off -cd %SCRIPTS% +cd %OPT% rem copy link to desktop ... -copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\DB Browser*" ^ - %PUBLIC%\Desktop\DB-Browser.lnk +copy /Y "%SCRIPTS%\links\SQLite-DBB.lnk" %PUBLIC%\Desktop + +rem refresh desktop (W10 style) +ie4uinit.exe -show echo ####### %0 ####### pause diff --git a/optional/install-emclient.cmd b/optional/install-emclient.cmd index 8d30af4..26416f1 100644 --- a/optional/install-emclient.cmd +++ b/optional/install-emclient.cmd @@ -1,6 +1,6 @@ @echo off -set SCRIPTS=..\scripts +set OPT=..\optional set SOFTWARE=..\software set MSI=emclient-setup.msi @@ -15,7 +15,7 @@ cd %SOFTWARE% @echo on msiexec /i %MSI% /quiet @echo off -cd %SCRIPTS% +cd %OPT% rem copy link to desktop ... copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\eM Client.lnk" ^ @@ -27,6 +27,9 @@ reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^ taskkill /F /IM SystemSettings.exe 2>nul +rem refresh desktop (W10 style) +ie4uinit.exe -show + echo ####### %0 ####### pause diff --git a/optional/install-googledrive.cmd b/optional/install-googledrive.cmd index 8bfc21c..efdb65e 100644 --- a/optional/install-googledrive.cmd +++ b/optional/install-googledrive.cmd @@ -1,6 +1,6 @@ @echo off -set SCRIPTS=..\scripts +set OPT=..\optional set SOFTWARE=..\software set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" set MSI=gsync-setup.msi @@ -16,7 +16,7 @@ cd %SOFTWARE% @echo on msiexec /i %MSI% /qn @echo off -cd %SCRIPTS% +cd %OPT% echo changing startmenu folder ... move /Y %STARTMENU%\"Backup and Sync from Google\Backup and Sync from Google.lnk" ^ diff --git a/optional/install-purebasic.cmd b/optional/install-purebasic.cmd index dcf7132..b8d8eea 100644 --- a/optional/install-purebasic.cmd +++ b/optional/install-purebasic.cmd @@ -24,7 +24,8 @@ if EXIST %EXE% ( del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul echo installing purebasic ... - %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS + start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL ^ + /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS goto LINK ) @@ -38,7 +39,8 @@ if EXIST %ZIP% ( move /Y %T%\purebasic\PureBasic*.exe %T%\purebasic\purebasic-setup.exe echo installing purebasic ... - %T%\purebasic\purebasic-setup.exe /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS + start /wait %T%\purebasic\purebasic-setup.exe ^ + /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS echo cleanup ... rd /S /Q %T%\purebasic 2>nul @@ -46,10 +48,16 @@ if EXIST %ZIP% ( ) :LINK +rem remove personal link ... +del /F /Q /A %USERPROFILE%\Desktop\PureBasic*.lnk 2>nul + echo copy new PureBasic link to desktop ... copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\PureBasic\PureBasic (x64).lnk" ^ %PUBLIC%\Desktop\PureBasic.lnk +rem refresh desktop (W10 style) +ie4uinit.exe -show + echo ####### %0 ####### :END pause diff --git a/optional/install-python2.cmd b/optional/install-python2.cmd index 27ae309..7f79884 100644 --- a/optional/install-python2.cmd +++ b/optional/install-python2.cmd @@ -1,8 +1,8 @@ @echo off -set SCRIPTS=..\scripts +set OPT=..\optional set SOFTWARE=..\software -set MSI=python-setup.msi +set MSI=python2-setup.msi if NOT EXIST %SOFTWARE%\%MSI% ( echo ERROR: %SOFTWARE%\%MSI% not found! @@ -15,6 +15,6 @@ cd %SOFTWARE% @echo on msiexec /i %MSI% /passive @echo off -cd %SCRIPTS% +cd %OPT% echo ####### %0 ####### diff --git a/optional/install-receiver.cmd b/optional/install-receiver.cmd index 19efac9..2d3b1d2 100644 --- a/optional/install-receiver.cmd +++ b/optional/install-receiver.cmd @@ -10,7 +10,7 @@ if NOT EXIST %EXE% ( echo ####### %0 ####### echo installing Citrix Receiver LTS ... -%EXE% /silent /noreboot +start /wait %EXE% /silent /noreboot echo disabling autostart for Citrix Receiver ... reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run32" ^ diff --git a/optional/install-softmaker.cmd b/optional/install-softmaker.cmd index 222a54e..e1144e7 100644 --- a/optional/install-softmaker.cmd +++ b/optional/install-softmaker.cmd @@ -1,6 +1,6 @@ @echo off -set SCRIPTS=..\scripts +set OPT=..\optional set SOFTWARE=..\software set MSI=softmaker-setup.msi @@ -17,7 +17,7 @@ msiexec /i %MSI% /qb APPLICATIONFOLDER="c:\Program Files\Softmaker Office 2021" INSTALLTM=1 INSTALLPM=1 INSTALLPR=1 INSTALLTB1=0 INSTALLTB2=0 /l*v c:\temp\softmaker.log @echo off del /F c:\temp\softmaker.log -cd %SCRIPTS% +cd %OPT% echo installing desktop icons ... copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 2021\PlanMaker 2021.lnk" ^ @@ -27,6 +27,9 @@ copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 20 copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 2021\TextMaker 2021.lnk" ^ %PUBLIC%\Desktop\Textmaker.lnk +rem refresh desktop (W10 style) +ie4uinit.exe -show + echo ####### %0 ####### pause diff --git a/optional/install-spotify.cmd b/optional/install-spotify.cmd index 6f23017..cdff2af 100644 --- a/optional/install-spotify.cmd +++ b/optional/install-spotify.cmd @@ -12,6 +12,9 @@ echo ####### %0 ####### echo installing Spotify for user %USERNAME% ... %EXE% +rem refresh desktop (W10 style) +ie4uinit.exe -show + echo ####### %0 ####### pause diff --git a/optional/install-teams.cmd b/optional/install-teams.cmd index 75145d9..082b963 100644 --- a/optional/install-teams.cmd +++ b/optional/install-teams.cmd @@ -10,12 +10,14 @@ if NOT EXIST %EXE% ( echo ####### %0 ####### echo installing Microsoft Teams ... -%EXE% -s -timeout /T 10 +start /wait %EXE% -s echo renaming and moving Teams desktop link ... move /Y "%USERPROFILE%\Desktop\Microsoft Teams.lnk" "%PUBLIC%\Desktop\Teams.lnk" +rem refresh desktop (W10 style) +ie4uinit.exe -show + echo ####### %0 ####### pause diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd index e15ba11..0185470 100644 --- a/optional/install-totalcommander.cmd +++ b/optional/install-totalcommander.cmd @@ -10,13 +10,13 @@ if NOT EXIST %EXE% ( echo ####### %0 ####### echo installing TotalCommander ... -%EXE% /AHMGDU - -rem this runs in the background - we have to wait 10 seconds for it to complete ... -timeout /T 10 +start /wait %EXE% /AHMGDU echo renaming and moving TotalCommander desktop link ... -move /Y "%USERPROFILE%\Desktop\Total Commander*" "%PUBLIC%\Desktop\Total Commander.lnk" +move /Y "%USERPROFILE%\Desktop\Total Commander*" "%PUBLIC%\Desktop\TCM.lnk" + +rem refresh desktop (W10 style) +ie4uinit.exe -show echo ####### %0 ####### pause diff --git a/optional/install-vscode.cmd b/optional/install-vscode.cmd index 037bcc0..6f6197c 100644 --- a/optional/install-vscode.cmd +++ b/optional/install-vscode.cmd @@ -2,6 +2,7 @@ set CONFIG=config\install-vscode.txt set EXE=..\software\vscode-setup.exe +set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" if NOT EXIST %EXE% ( echo ERROR: %EXE% not found! @@ -10,11 +11,25 @@ if NOT EXIST %EXE% ( echo ####### %0 ####### -echo killing ssh processes... +echo killing VisualStudio code processes... taskkill /F /IM Code.exe 2>nul +echo cleanup ... +del /F "%PUBLIC%\Desktop\VScode.lnk" 2>nul + echo installing Visual Studio CODE ... -%EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS +rem start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS + +echo installing Desktop shortcut ... +@echo on +copy /Y %STARTMENU%\"Visual Studio Code\Visual*.lnk" "%PUBLIC%\Desktop" +move /Y "%PUBLIC%\Desktop\Visual*.lnk" "%PUBLIC%\Desktop\VScode.lnk" + +rem refresh desktop (W10 style) +ie4uinit.exe -show + +echo killing VisualStudio code processes... +taskkill /F /IM Code.exe 2>nul echo ####### %0 ####### pause diff --git a/optional/install-xnview.cmd b/optional/install-xnview.cmd index 6775275..c1f7b96 100644 --- a/optional/install-xnview.cmd +++ b/optional/install-xnview.cmd @@ -14,11 +14,14 @@ echo killing XnView processes... taskkill /F /IM xnviewmp.exe 2>nul echo installing XnView ... -%EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS +start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS echo renaming and moving XnView desktop link ... move /Y "%USERPROFILE%\Desktop\XnViewMP.lnk" "%PUBLIC%\Desktop" +rem refresh desktop (W10 style) +ie4uinit.exe -show + echo ####### %0 ####### pause diff --git a/optional/uninstall-telemetry.cmd b/optional/uninstall-telemetry.cmd index c48e118..7bf95b2 100644 --- a/optional/uninstall-telemetry.cmd +++ b/optional/uninstall-telemetry.cmd @@ -5,9 +5,15 @@ rem most of this was took from: rem https://forum.level1techs.com/t/take-back-your-windows-10-privacy/143097/2 rem THANKS! +echo. echo WARNING: executing this script may cripple some important functions in windows! echo especially the store app will not work anymore - and it will be removed by this script! +echo. +echo WARNING: system will be REBOOTED after modify! +echo SAVE YOUR WORK AND COME BACK! +echo. + set answer= :ask set /p answer="REALLY remove all Microsoft telemetry (Y/N)? " @@ -201,4 +207,5 @@ powershell -Command ./uninstall-store.ps1 echo. echo ####### %0 ####### pause +shutdown -g -t 0 diff --git a/scripts/links/SQLite-DBB.lnk b/scripts/links/SQLite-DBB.lnk new file mode 100644 index 0000000..7d605dd Binary files /dev/null and b/scripts/links/SQLite-DBB.lnk differ