WINDOWS/w10install
0
Fork 0
Code Issues 2 Releases 5 Activity

bugfix

Browse Source
This commit is contained in:
Michael H.G. Schmidt 2024-02-23 14:29:31 +01:00
parent 6f49c025f1
commit e42b241c9d
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
06_Copy2Media.cmd
View File

@ -4,7 +4,7 @@ set SOURCES=%W10%\sources
set BOOTFILE=boot.wim
set IMAGEFILE=install.wim
set SCRIPT_SETTINGS=scripts\settings.cmd
set COMPANY_SETTINGS=company\settings.cmd
set CUSTOM_SETTINGS=custom\settings.cmd
IF %1.==. GOTO USAGE
@ -67,7 +67,7 @@ if EXIST software (
/XF *.iso /XF *.txt /XF *.cmd /XF *.csv /XF .gitignore /XD .git
)
for %%P in (drivers scripts source optional personal company apps) do (
for %%P in (drivers scripts source optional personal apps custom) do (
if EXIST %%P (
echo.
echo copying folder [ %%P ] to %DRIVE%\tools ...
@ -84,20 +84,25 @@ echo.
echo putting copytools script to %DRIVE% ...
copy /Y image\CopyTools.cmd %DRIVE%\
rem remove hidden attribute from tools folder ...
echo.
echo removing hidden attribute from tools folder ...
attrib -H %DRIVE%\tools
echo.
rem remove passwords from settings.cmd config files ...
echo removing passwords from settings.cmd config files ...
for %%A in (
%DRIVE%\tools\%SCRIPT_SETTINGS%
%DRIVE%\tools\%COMPANY_SETTINGS%
%DRIVE%\tools\%CUSTOM_SETTINGS%
) do (
if EXIST %%A (
tools\searchreplace %%A "^.*SET.*LOCALADMIN_PASSWORD.*=.*" "set localadmin_password=DELETED"
)
)
echo.
echo deleting ftpsettings.cmd ...
del /F /Q %DRIVE%\tools\custom\ftpsettings.cmd
echo.
echo ======
echo READY.

6
README.md
View File

@ -340,7 +340,7 @@ FTP_PASS=mypass
The folder "personal" is also used by some other scripts in this project. You can place config files or license files in this folder (This will be described in detail in some other chapters). It may be a good idea to have this folder ("personal") as GIT repository on git or somewhere else - just my 50 cents.
There is also a folder "company" which can be used for license files and special binaries. I'm also recommending to create a git repository that will be checked out by you just before creating the target media.
There is also a folder "custom" which can be used for license files and special binaries. I'm also recommending to create a git repository that will be checked out by you just before creating the target media.
Both folders must be created before calling the script that copies all files to the media. They will then be copied to the target machine when installing it via the Media ...
@ -465,8 +465,8 @@ The operation completed successfully.
searching for SCRIPT settings ...
OK. Loading SCRIPT settings ...
searching for COMPANY settings ...
INFO: config file ..\company\settings.cmd NOT FOUND
searching for CUSTOM settings ...
INFO: config file ..\custom\settings.cmd NOT FOUND
renaming Windows setup.exe to boot image ...
1 file(s) moved.