diff --git a/scripts/disable-networkfeatures.cmd b/scripts/disable-networkfeatures.cmd new file mode 100644 index 0000000..57b4e7b --- /dev/null +++ b/scripts/disable-networkfeatures.cmd @@ -0,0 +1,12 @@ +@echo off +set TOOLS=c:\tools + +net session >nul 2>&1 +if NOT %ERRORLEVEL% == 0 ( + echo ERROR: User has NO ADMINISTRATOR rights! + exit /b +) + +echo disabling unwanted NETWORK features ... +powershell -command %TOOLS%\scripts\disable-networkfeatures.ps1 + diff --git a/source/prompt-user.pb b/source/prompt-user.pb new file mode 100644 index 0000000..dde7e9b --- /dev/null +++ b/source/prompt-user.pb @@ -0,0 +1,34 @@ +; prompt-user.pb +; ------------------------------------------------------------ +; this tool displays a message requester showing a custom text +; LICENSE : GPL +; AUTHOR : Michael H.G. Schmidt +; EMAIL : michael@schmidt2.de +; DATE : 20221224 +; ------------------------------------------------------------ +; + + +OpenConsole() + +; check commandline ... +If ( CountProgramParameters() <> 1 ) + ConsoleColor(14,0) + PrintN("") + PrintN("usage: prompt-user ") + PrintN("") + ConsoleColor(15,0) + PrintN("show a message for the user") + ConsoleColor(7,0) + PrintN("") + End 99 +EndIf + +; get arguments ... +message$ = ProgramParameter(0) + +MessageRequester("System Message", message$, #PB_MessageRequester_Info| #PB_MessageRequester_Info) + +; IDE Options = PureBasic 5.73 LTS (Windows - x64) +; CursorPosition = 30 +; EnableXP \ No newline at end of file diff --git a/tools/logon.cmd b/tools/logon.cmd index 73cfcaa..7c42e83 100644 --- a/tools/logon.cmd +++ b/tools/logon.cmd @@ -225,15 +225,17 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer" ^ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer" ^ /v "ShowFrequent" /t REG_DWORD /d 0 /f 1>nul -echo disabling unwanted NETWORK features ... -powershell -command %TOOLS%\scripts\disable-networkfeatures.ps1 +rem try to disable unwanted network features +call %TOOLS%\scripts\disable-networkfeatures.cmd rem try to cleanup the tiles in the start menu (only for admins) call %TOOLS%\scripts\cleanup-tiles.cmd -rem ========= -rem SEAFILE -rem ========= +echo. +echo ========= +echo SEAFILE +echo ========= +echo. echo setting path for SEAFILE files ... reg add "HKEY_CURRENT_USER\SOFTWARE\SeaFile" ^ @@ -250,23 +252,8 @@ if seafile_domain == 0 ( /v "PreconfigureUserToken" /d "null" /t REG_SZ /f 1>nul ) -rem create a statusfile (this codeblock must be executed only once per user) ... -echo 1 >%USERCONFIG_DONE% - -:USERTWEAKS_DONE - - -rem ======================================== -rem ACCOUNT CLEANUP AND FIXES (runs always) -rem ======================================== - echo. -echo ##### -echo ##### CLEANING ... -echo ##### -echo. - -echo Reorganizing start menu and desktop ... +echo reorganizing start menu and desktop echo ######################################## echo. @@ -293,11 +280,6 @@ echo Removing microsoft edge links in start menu... del /F %STARTMENU%\"Microsoft Edge.lnk" 2>nul del /F %USERPROFILE%\"Desktop\Microsoft Edge.lnk" 2>nul -rem ... stupid OS problem #7 -rem Rewards ? Really ? Seriously ? -echo Disabling nag screen in windows settings ... -%TOOLS%\vivetool delconfig 18299130 1 - rem IE too! echo Removing IE links in start menu, sigh ... del /F %STARTMENU%\"Accessories\Internet Explorer.lnk" 2>nul @@ -310,16 +292,42 @@ rd /S /Q %STARTMENU%\"Administrative Tools" 2>nul rd /S /Q %STARTMENU%\"Maintenance" 2>nul rd /S /Q %STARTMENU%\"System Tools" 2>nul rd /S /Q %STARTMENU%\"Windows Powershell" 2>nul + +rem create a statusfile (this codeblock must be executed only once per user) ... +echo 1 >%USERCONFIG_DONE% + +:USERTWEAKS_DONE + + +rem ======================================== +rem ACCOUNT CLEANUP AND FIXES (runs always) +rem ======================================== + +echo. +echo ##### +echo ##### CLEANUP +echo ##### + +echo. + +echo ... user settings +echo ######################################## +echo. + +rem ... stupid OS problem #7 +rem Rewards ? Really ? Seriously ? +echo Disabling nag screen in windows settings ... +%TOOLS%\vivetool delconfig 18299130 1 + +echo. +echo ... users home directory +echo ######################################## echo. rem WARNING! rem DO NOT remove the "PICTURES" folder! rem this is used and needed by the snipping tool! -echo Cleaning users home directory ... -echo ######################################## -echo. - echo 3D Objects ... rd /S /Q %USERPROFILE%\"3D Objects" 2>nul @@ -351,10 +359,14 @@ for %%D in ( ) -echo creating Pictures folder for Snipping Tool ... +echo. +echo OTHER tasks and fixes for the user +echo ######################################## +echo. + +echo Creating pictures folder for snipping tool ... mkdir %USERPROFILE%\Pictures 2>nul -echo. echo Starting workstation service ... net start workstation 1>nul 2>nul net config workstation diff --git a/wim/StartCustomSetup.cmd b/wim/StartCustomSetup.cmd index 5544d6c..8839b7c 100644 --- a/wim/StartCustomSetup.cmd +++ b/wim/StartCustomSetup.cmd @@ -10,6 +10,8 @@ date /t time /t echo. +rem scan for the USB stick (infinite) ... +:loop for %%D in (A B D E F G H I J K L M N O P Q R S T U V W X Y Z) do ( if EXIST %%D:\%BATCH% ( @@ -19,9 +21,12 @@ for %%D in (A B D E F G H I J K L M N O P Q R S T U V W X Y Z) do ( GOTO END ) else ( echo INFO: %BATCH% not found on drive %%D! + echo INFO: Calling the GUI helper to prompt the user to use a different USB port ... + prompt-user "Custom setup script NOT found! Please disconnect the USB stick and connect it to another USB port. Then click on OK." ) ) +goto loop :END diff --git a/wim/finish-image.cmd b/wim/finish-image.cmd index db129ff..28e131e 100644 --- a/wim/finish-image.cmd +++ b/wim/finish-image.cmd @@ -17,6 +17,7 @@ mkdir %IMAGE%\Windows\Setup\scripts 1>nul 2>nul echo [%0] INFO: copying scripts to %IMAGE%\Windows\Setup\scripts ... copy /Y SetupComplete.cmd %IMAGE%\Windows\Setup\scripts copy /Y StartCustomSetup.cmd %IMAGE%\Windows\Setup\scripts +copy /Y ..\tools\prompt-user.exe %IMAGE%\Windows\Setup\scripts if %ERRORLEVEL% NEQ 0 ( echo [%0] ERROR: while copying scripts to IMAGE exit /b