From ab05f27cf489d945a6039a518c891dd4ad03697a Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" <michael@schmidt2.de> Date: Wed, 21 Feb 2024 11:58:08 +0100 Subject: [PATCH] removed references to company folder --- scripts/autoconfig.cmd | 12 ++++++------ scripts/copy-executables.cmd | 8 -------- scripts/disable-accountpicture.cmd | 12 ++++++------ scripts/modify-explorer.cmd | 12 ++++++------ scripts/modify-windowsupdate.cmd | 12 ++++++------ tools/adjoin.cmd | 8 ++++---- tools/logon.cmd | 12 ++++++------ tools/personalfiles.cmd | 12 ++++++------ 8 files changed, 40 insertions(+), 48 deletions(-) diff --git a/scripts/autoconfig.cmd b/scripts/autoconfig.cmd index 1ee9154..6e53cc9 100644 --- a/scripts/autoconfig.cmd +++ b/scripts/autoconfig.cmd @@ -6,7 +6,7 @@ set TOOLS=%SystemDrive%\tools set SCRIPTS=%TOOLS%\scripts set LOG=%SCRIPTS%\autoconfig.txt set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd -set COMPANY_SETTINGS=%TOOLS%\company\settings.cmd +set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd rem start logging ... del /F /Q %LOG% 1>nul 2>nul @@ -61,12 +61,12 @@ if NOT EXIST %SCRIPT_SETTINGS% ( ) echo. -echo searching for COMPANY settings ... -if NOT EXIST %COMPANY_SETTINGS% ( - echo INFO: config file %COMPANY_SETTINGS% NOT FOUND +echo searching for CUSTOM settings ... +if NOT EXIST %CUSTOM_SETTINGS% ( + echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND ) else ( - echo OK. Loading COMPANY settings ... - call %COMPANY_SETTINGS% + echo OK. Loading CUSTOM settings ... + call %CUSTOM_SETTINGS% ) rem show all the settings ... diff --git a/scripts/copy-executables.cmd b/scripts/copy-executables.cmd index db95cfb..4004b72 100644 --- a/scripts/copy-executables.cmd +++ b/scripts/copy-executables.cmd @@ -2,7 +2,6 @@ set TOOLS=%SystemDrive%\tools set SOFTWARE=..\software -set COMPANY=..\company echo ####### %0 ####### @@ -28,12 +27,5 @@ for %%E in ( ) -rem copy licensed snapshot64 executable -rem (license is written to the binary) -if EXIST %COMPANY%\snapshot64.exe ( - echo installing licensed version of snapshot64 ... - copy /Y %COMPANY%\snapshot64.exe %TOOLS% -) - echo ####### %0 ####### diff --git a/scripts/disable-accountpicture.cmd b/scripts/disable-accountpicture.cmd index dd63c26..28a9e31 100644 --- a/scripts/disable-accountpicture.cmd +++ b/scripts/disable-accountpicture.cmd @@ -1,7 +1,7 @@ @echo off set SCRIPT_SETTINGS=settings.cmd -set COMPANY_SETTINGS=..\company\settings.cmd +set CUSTOM_SETTINGS=..\customsettings.cmd rem default: empty logo (disables all logos on logon screen) set TARGET="%ALLUSERSPROFILE%\Microsoft\User Account Pictures" @@ -20,12 +20,12 @@ if NOT EXIST %SCRIPT_SETTINGS% ( ) echo. -echo searching for COMPANY settings ... -if NOT EXIST %COMPANY_SETTINGS% ( - echo INFO: config file %COMPANY_SETTINGS% NOT FOUND +echo searching for CUSTOM settings ... +if NOT EXIST %CUSTOM_SETTINGS% ( + echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND ) else ( - echo OK. Loading COMPANY settings ... - call %COMPANY_SETTINGS% + echo OK. Loading CUSTOM settings ... + call %CUSTOM_SETTINGS% ) echo ++++++++++++++++++ diff --git a/scripts/modify-explorer.cmd b/scripts/modify-explorer.cmd index fb4bba7..45d9494 100644 --- a/scripts/modify-explorer.cmd +++ b/scripts/modify-explorer.cmd @@ -1,7 +1,7 @@ @echo off set SCRIPT_SETTINGS=settings.cmd -set COMPANY_SETTINGS=..\company\settings.cmd +set CUSTOM_SETTINGS=..\customsettings.cmd rem default: disabled set explorer_quick_access=0 @@ -18,12 +18,12 @@ if NOT EXIST %SCRIPT_SETTINGS% ( ) echo. -echo searching for COMPANY settings ... -if NOT EXIST %COMPANY_SETTINGS% ( - echo INFO: config file %COMPANY_SETTINGS% NOT FOUND +echo searching for CUSTOM settings ... +if NOT EXIST %CUSTOM_SETTINGS% ( + echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND ) else ( - echo OK. Loading COMPANY settings ... - call %COMPANY_SETTINGS% + echo OK. Loading CUSTOM settings ... + call %CUSTOM_SETTINGS% ) echo ++++++++++++++++++++++++++++++++++ diff --git a/scripts/modify-windowsupdate.cmd b/scripts/modify-windowsupdate.cmd index 13fc943..c01ca3e 100644 --- a/scripts/modify-windowsupdate.cmd +++ b/scripts/modify-windowsupdate.cmd @@ -1,7 +1,7 @@ @echo off set SCRIPT_SETTINGS=settings.cmd -set COMPANY_SETTINGS=..\company\settings.cmd +set CUSTOM_SETTINGS=..\customsettings.cmd rem default: disabled set windows_targetrelease=0 @@ -18,12 +18,12 @@ if NOT EXIST %SCRIPT_SETTINGS% ( ) echo. -echo searching for COMPANY settings ... -if NOT EXIST %COMPANY_SETTINGS% ( - echo INFO: config file %COMPANY_SETTINGS% NOT FOUND +echo searching for CUSTOM settings ... +if NOT EXIST %CUSTOM_SETTINGS% ( + echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND ) else ( - echo OK. Loading COMPANY settings ... - call %COMPANY_SETTINGS% + echo OK. Loading CUSTOM settings ... + call %CUSTOM_SETTINGS% ) echo ++++++++++++++++++++++++++++++++++ diff --git a/tools/adjoin.cmd b/tools/adjoin.cmd index a4c2f49..4e26445 100644 --- a/tools/adjoin.cmd +++ b/tools/adjoin.cmd @@ -4,7 +4,7 @@ if %ERRORLEVEL% neq 0 exit /b set TOOLS=c:\tools set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd -set COMPANY_SETTINGS=%TOOLS%\company\settings.cmd +set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd echo ####### %0 ####### @@ -14,10 +14,10 @@ if NOT EXIST %SCRIPT_SETTINGS% ( call %SCRIPT_SETTINGS% ) -if NOT EXIST %COMPANY_SETTINGS% ( - echo INFO: config file %COMPANY_SETTINGS% NOT FOUND +if NOT EXIST %CUSTOM_SETTINGS% ( + echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND ) else ( - call %COMPANY_SETTINGS% + call %CUSTOM_SETTINGS% ) echo JOINING domain ... diff --git a/tools/logon.cmd b/tools/logon.cmd index 2a0db6e..1262280 100644 --- a/tools/logon.cmd +++ b/tools/logon.cmd @@ -6,7 +6,7 @@ rem =================== set TOOLS=%SystemDrive%\tools set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd -set COMPANY_SETTINGS=%TOOLS%\company\settings.cmd +set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd set CUSTOM_SCRIPT=%TOOLS%\custom.cmd set USERCONFIG_DONE="%LOCALAPPDATA%"\.userconfig_done set EMLICENSE_DONE="%LOCALAPPDATA%"\.emlicense_done @@ -56,12 +56,12 @@ if NOT EXIST %SCRIPT_SETTINGS% ( ) echo. -echo searching for COMPANY settings ... -if NOT EXIST %COMPANY_SETTINGS% ( - echo INFO: config file %COMPANY_SETTINGS% NOT FOUND +echo searching for CUSTOM settings ... +if NOT EXIST %CUSTOM_SETTINGS% ( + echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND ) else ( - echo OK. Loading COMPANY settings ... - call %COMPANY_SETTINGS% + echo OK. Loading CUSTOM settings ... + call %CUSTOM_SETTINGS% ) rem ================================================ diff --git a/tools/personalfiles.cmd b/tools/personalfiles.cmd index e032145..0b6dc1f 100644 --- a/tools/personalfiles.cmd +++ b/tools/personalfiles.cmd @@ -6,7 +6,7 @@ rem =================== set TOOLS=c:\tools set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd -set COMPANY_SETTINGS=%TOOLS%\company\settings.cmd +set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd set PERSONALFILES_DONE=%LOCALAPPDATA%\.personalfiles_done set GITWORKDIR=%USERPROFILE%\workspace set gitrepo=undefined @@ -36,12 +36,12 @@ if NOT EXIST %SCRIPT_SETTINGS% ( ) echo. -echo searching for COMPANY settings ... -if NOT EXIST %COMPANY_SETTINGS% ( - echo INFO: config file %COMPANY_SETTINGS% NOT FOUND +echo searching for CUSTOM settings ... +if NOT EXIST %CUSTOM_SETTINGS% ( + echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND ) else ( - echo OK. Loading COMPANY settings ... - call %COMPANY_SETTINGS% + echo OK. Loading CUSTOM settings ... + call %CUSTOM_SETTINGS% ) echo ++++++++++++++++++