From 363c327bfd0d7f72bfca9663cffe9fd1f4514ebb Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sun, 22 Jan 2023 14:29:05 +0100
Subject: [PATCH] renamed variable support_user to localadmin

---
 06_Copy2Stick.cmd    | 14 ++++++--------
 scripts/settings.cmd |  1 +
 tools/logon.cmd      |  8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/06_Copy2Stick.cmd b/06_Copy2Stick.cmd
index 61da6dc..b0114d3 100644
--- a/06_Copy2Stick.cmd
+++ b/06_Copy2Stick.cmd
@@ -6,8 +6,6 @@ set IMAGE=install.wim
 set SCRIPT_SETTINGS=scripts\settings.cmd
 set COMPANY_SETTINGS=company\settings.cmd
 set LANG=en-US
-set support_user=
-set support_password=
 
 IF %1.==. GOTO USAGE
 
@@ -82,8 +80,8 @@ set answer=B
 
 rem ask for user ...
 set MYUSER=localadmin
-if "@%support_user%" NEQ "@" (
-  set MYUSER=%support_user%
+if "@%localadmin%" NEQ "@" (
+  set MYUSER=%localadmin%
 ) else (
   echo.
   set /p MYUSER="Username (%MYUSER%)? "
@@ -91,8 +89,8 @@ if "@%support_user%" NEQ "@" (
 
 rem ask for real name ...
 set MYNAME=Local Administrator
-if "@%support_name%" NEQ "@" (
-  set MYNAME=%support_name%
+if "@%localadmin_name%" NEQ "@" (
+  set MYNAME=%localadmin_name%
 ) else (
   echo.
   set /p MYNAME="Display Name (%MYNAME%)? "
@@ -100,8 +98,8 @@ if "@%support_name%" NEQ "@" (
 
 rem ask for a password ...
 set MYPASS=
-if "@%support_password%" NEQ "@" (
-  set MYPASS=%support_password%
+if "@%localadmin_password%" NEQ "@" (
+  set MYPASS=%localadmin_password%
 ) else (
   echo.
   set /p MYPASS="Password (not set)? "
diff --git a/scripts/settings.cmd b/scripts/settings.cmd
index 645642f..bc5da93 100644
--- a/scripts/settings.cmd
+++ b/scripts/settings.cmd
@@ -12,4 +12,5 @@ set preserve_savedgames_folder=1
 set searchdomains=localdomain,fritz.box
 set gitserver=github.com
 set gitrepo=my_repo_at_github
+set localadmin_password=
 
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 22836f1..284c535 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -20,7 +20,7 @@ set bgcol_R=0
 set bgcol_G=0
 set bgcol_B=0
 set LANG=en-US
-set support_user=
+set localadmin=
 set support_password=
 set emclient_license=0
 set seafile_domain=0
@@ -81,7 +81,7 @@ reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Fold
   /v Desktop /t REG_EXPAND_SZ /d "%USERPROFILE%\Desktop" /f 1>nul
 
 rem NO seafile Autostart for the Admin!
-if EXIST "%ProgramFiles%\Seafile\bin\seafile-applet.exe" if "%USERNAME%" NEQ "%SUPPORT_USER%" (
+if EXIST "%ProgramFiles%\Seafile\bin\seafile-applet.exe" if "%USERNAME%" NEQ "%localadmin%" (
   echo Setting autostart for SEAFILE client ...
   reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^
     /v Seafile /t REG_SZ /d "%ProgramFiles%\Seafile\bin\seafile-applet.exe" /f 1>nul
@@ -101,7 +101,7 @@ rem licensing for emClient already done ?
 if EXIST %EMLICENSE_DONE% GOTO EMCLIENT_DONE
 
 rem no emClient for the Admin!
-if "%USERNAME%" == "%SUPPORT_USER%" GOTO EMCLIENT_DONE
+if "%USERNAME%" == "%localadmin%" GOTO EMCLIENT_DONE
 
 if %emclient_license% == 0 (
   echo no emClient license found!
@@ -283,7 +283,7 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" ^
   /v "ShowFrequent" /t REG_DWORD /d 0 /f 1>nul
 
 rem no SEAFILE for the Admin!
-if "%USERNAME%" == "%SUPPORT_USER%" GOTO SEAFILE_DONE
+if "%USERNAME%" == "%localadmin%" GOTO SEAFILE_DONE
 
 echo.
 echo preparing the SEAFILE configuration