From 556c72164b0a93e44b45783328485785c99d57d4 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Sun, 1 Jan 2023 13:09:14 +0100 Subject: [PATCH] removed company settings file from autoconfig script --- scripts/autoconfig-all.cmd | 45 +++++++++++++++++++++++--------------- scripts/settings.cmd | 1 + 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd index da79443..a9b450a 100644 --- a/scripts/autoconfig-all.cmd +++ b/scripts/autoconfig-all.cmd @@ -3,9 +3,9 @@ rem this script is doing most of the work ... set T=c:\TEMP set TOOLS=c:\tools +set SETTINGS=settings.cmd set SCRIPTS=%TOOLS%\scripts set LOG=%SCRIPTS%\autoconfig-all.txt -set COMPANY_SETTINGS=..\company\settings.cmd del /F %LOG% 1>nul 2>nul if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1 @@ -26,36 +26,45 @@ echo cd to %SCRIPTS% ... cd /D %SCRIPTS% rem SCRIPT settings ... -if EXIST settings.cmd ( +if EXIST %SETTINGS% ( echo loading settings ... - call settings.cmd + call %SETTINGS% ) else ( - echo WARNING: settings.cmd not found! + echo WARNING: [ %SETTINGS% ] not found! echo setting defaults ... - set windows_updates=1 + + set LANG=en-US + set windows_updates=0 + set logon_logo=1 + set install_firefox=1 + set install_aerolite=1 + set bgcol_R=3 + set bgcol_G=131 + set bgcol_B=135 + set explorer_quick_access=1 + set gitserver=github.com + set gitrepo=dummy + set searchdomains=localdomain + ) echo ++++++++++++++++++ +echo LANG=%LANG% echo windows_updates=%windows_updates% +echo logon_logo=%logon_logo% echo install_firefox=%install_firefox% echo install_aerolite=%install_aerolite% -echo ++++++++++++++++++ -echo. - -rem COMPANY settings ... -set searchdomains= -if NOT EXIST %COMPANY_SETTINGS% ( - echo INFO: COMPANY %COMPANY_SETTINGS% NOT FOUND -) else ( - echo OK. Loading COMPANY settings ... - call %COMPANY_SETTINGS% -) - -echo ++++++++++++++++++ +echo bgcol_R=%bgcol_R% +echo bgcol_G=%bgcol_G% +echo bgcol_B=%bgcol_B% +echo explorer_quick_access=%explorer_quick_access% +echo gitserver=%gitserver% +echo gitrepo=%gitrepo% echo searchdomains=%searchdomains% echo ++++++++++++++++++ echo. + echo ####################### echo ### UNPACK and COPY ### echo ####################### diff --git a/scripts/settings.cmd b/scripts/settings.cmd index d2745b9..0e33f94 100644 --- a/scripts/settings.cmd +++ b/scripts/settings.cmd @@ -9,4 +9,5 @@ set bgcol_B=135 set explorer_quick_access=1 set gitserver=gitea.exabyte.systems set gitrepo=personal +set searchdomains=exabyte.systems,exabyte-systems.com