From 6e3a47775031b700c32623b9d27fd92c70c2cbd8 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Fri, 23 Feb 2024 14:03:56 +0100
Subject: [PATCH] little reorg

---
 .gitignore                            | 4 ----
 image/finish-boot.cmd                 | 2 +-
 scripts/autoconfig.cmd                | 2 +-
 scripts/disable-accountpicture.cmd    | 2 +-
 scripts/modify-explorer.cmd           | 2 +-
 scripts/modify-windowsupdate.cmd      | 2 +-
 software/.gitignore                   | 1 +
 software/download-from-ftp.cmd        | 2 +-
 software/other.csv                    | 2 ++
 software/upload-to-ftp-singlefile.cmd | 2 +-
 software/upload-to-ftp.cmd            | 2 +-
 tools/logon.cmd                       | 4 ++--
 12 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3dde55..6083d41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,4 @@ distribution
 SOFTWAREBKP
 tmp/
 temp/
-company/
-ftpsettings.cmd
-customsettings.cmd
-custom.cmd
 
diff --git a/image/finish-boot.cmd b/image/finish-boot.cmd
index 2f52765..15ec748 100644
--- a/image/finish-boot.cmd
+++ b/image/finish-boot.cmd
@@ -2,7 +2,7 @@
 set SOURCES=%SystemDrive%\TEMP\W10\sources
 set BOOT=%SystemDrive%\TEMP\BOOT
 set SCRIPT_SETTINGS=..\scripts\settings.cmd
-set CUSTOM_SETTINGS=..\customsettings.cmd
+set CUSTOM_SETTINGS=..\custom\settings.cmd
 set LANG=en-US
 set localadmin=localadmin
 set localadmin_name=Local Administrator
diff --git a/scripts/autoconfig.cmd b/scripts/autoconfig.cmd
index 6e53cc9..fa0859b 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 CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd
+set CUSTOM_SETTINGS=%TOOLS%\custom\settings.cmd
 
 rem start logging ...
 del /F /Q %LOG% 1>nul 2>nul
diff --git a/scripts/disable-accountpicture.cmd b/scripts/disable-accountpicture.cmd
index 28a9e31..8eeb68b 100644
--- a/scripts/disable-accountpicture.cmd
+++ b/scripts/disable-accountpicture.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 set SCRIPT_SETTINGS=settings.cmd
-set CUSTOM_SETTINGS=..\customsettings.cmd
+set CUSTOM_SETTINGS=..\custom\settings.cmd
 
 rem default: empty logo (disables all logos on logon screen)
 set TARGET="%ALLUSERSPROFILE%\Microsoft\User Account Pictures"
diff --git a/scripts/modify-explorer.cmd b/scripts/modify-explorer.cmd
index 45d9494..d0c3852 100644
--- a/scripts/modify-explorer.cmd
+++ b/scripts/modify-explorer.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 set SCRIPT_SETTINGS=settings.cmd
-set CUSTOM_SETTINGS=..\customsettings.cmd
+set CUSTOM_SETTINGS=..\custom\settings.cmd
 
 rem default: disabled
 set explorer_quick_access=0
diff --git a/scripts/modify-windowsupdate.cmd b/scripts/modify-windowsupdate.cmd
index c01ca3e..ee04fe9 100644
--- a/scripts/modify-windowsupdate.cmd
+++ b/scripts/modify-windowsupdate.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 set SCRIPT_SETTINGS=settings.cmd
-set CUSTOM_SETTINGS=..\customsettings.cmd
+set CUSTOM_SETTINGS=..\custom\settings.cmd
 
 rem default: disabled
 set windows_targetrelease=0
diff --git a/software/.gitignore b/software/.gitignore
index fd8b606..8d159b6 100644
--- a/software/.gitignore
+++ b/software/.gitignore
@@ -13,4 +13,5 @@
 *.vsix
 *.msu
 *.part
+*.key
 
diff --git a/software/download-from-ftp.cmd b/software/download-from-ftp.cmd
index b321947..bf7ca89 100644
--- a/software/download-from-ftp.cmd
+++ b/software/download-from-ftp.cmd
@@ -1,5 +1,5 @@
 @echo off
-set FTPSETTINGS=..\ftpsettings.cmd
+set FTPSETTINGS=..\custom\ftpsettings.cmd
 
 rem ===================
 rem CONFIGFILE CHECK
diff --git a/software/other.csv b/software/other.csv
index fa814e1..6a16cc0 100644
--- a/software/other.csv
+++ b/software/other.csv
@@ -9,4 +9,6 @@ dummy iview-plugins.zip
 dummy chrome-setup.msi
 dummy VMRC-setup.exe
 dummy snapshot64_licensed.exe
+dummy wincmd.key
+dummy purebasic-setup_licensed.exe
 
diff --git a/software/upload-to-ftp-singlefile.cmd b/software/upload-to-ftp-singlefile.cmd
index 80dbf00..af9933c 100644
--- a/software/upload-to-ftp-singlefile.cmd
+++ b/software/upload-to-ftp-singlefile.cmd
@@ -1,5 +1,5 @@
 @echo off
-set FTPSETTINGS=..\ftpsettings.cmd
+set FTPSETTINGS=..\custom\ftpsettings.cmd
 
 rem ===================
 rem CONFIGFILE CHECK
diff --git a/software/upload-to-ftp.cmd b/software/upload-to-ftp.cmd
index f1935e7..b69704d 100644
--- a/software/upload-to-ftp.cmd
+++ b/software/upload-to-ftp.cmd
@@ -1,5 +1,5 @@
 @echo off
-set FTPSETTINGS=..\ftpsettings.cmd
+set FTPSETTINGS=..\custom\ftpsettings.cmd
 
 rem ===================
 rem CONFIGFILE CHECK
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 1262280..2d548e8 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -6,8 +6,8 @@ rem ===================
 
 set TOOLS=%SystemDrive%\tools
 set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd
-set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd
-set CUSTOM_SCRIPT=%TOOLS%\custom.cmd
+set CUSTOM_SETTINGS=%TOOLS%\custom\settings.cmd
+set CUSTOM_SCRIPT=%TOOLS%\custom\custom.cmd
 set USERCONFIG_DONE="%LOCALAPPDATA%"\.userconfig_done
 set EMLICENSE_DONE="%LOCALAPPDATA%"\.emlicense_done
 set EMSETTINGS_DONE="%LOCALAPPDATA%"\.emsettings_done