From 3aa5cc35ff244f573fb0ac19489a581287085c5b Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Fri, 29 Jan 2021 12:30:37 +0100
Subject: [PATCH] .

---
 scripts/autoconfig-all.cmd |  6 +++---
 scripts/deploy/logon.cmd   | 14 ++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 62a89cb..51b0ba2 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -68,9 +68,6 @@ echo ### INSTALL tasks ###
 echo #####################
 echo.
 
-call install-logonscript.cmd
-echo.
-
 call install-desktopicons.cmd
 echo.
 
@@ -106,6 +103,9 @@ echo.
 call install-antivir.cmd
 echo.
 
+call install-logonscript.cmd
+echo.
+
 echo #####################
 echo ### DISABLE tasks ###
 echo #####################
diff --git a/scripts/deploy/logon.cmd b/scripts/deploy/logon.cmd
index b3155cd..f06b426 100644
--- a/scripts/deploy/logon.cmd
+++ b/scripts/deploy/logon.cmd
@@ -36,14 +36,20 @@ echo creating some directories and copy files for current user ...
 rem SSH
 mkdir %USERPROFILE%\workspace 1>nul 2>nul
 mkdir %USERPROFILE%\.ssh 1>nul 2>nul
-xcopy /D %TOOLS%\scripts\config\ssh-config.txt %USERPROFILE%\.ssh\config
+if NOT EXIST %USERPROFILE%\.ssh\config (
+  copy /Y %TOOLS%\scripts\config\ssh-config.txt %USERPROFILE%\.ssh\config
+)
 
 rem WINDOWS TERMINAL
-xcopy /D %TOOLS%\scripts\config\wt-settings.json ^
-  %LOCALAPPDATA%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json
+if NOT EXIST %LOCALAPPDATA%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json (
+  copy /Y %TOOLS%\scripts\config\wt-settings.json ^
+    %LOCALAPPDATA%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json
+)
 
 rem TOTALCOMMANDER
-xcopy /D %TOOLS%\scripts\config\wcx_ftp.ini %windir%
+if NOT EXIST %windir%\wcx_ftp.ini (
+  copy /Y %TOOLS%\scripts\config\wcx_ftp.ini %windir%
+)
 
 rem ###
 rem ######