From 19ce5b217930393dd066128716baa51f93bdfe7c Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sun, 14 Mar 2021 23:14:01 +0100
Subject: [PATCH] bugfixing

---
 optional/install-totalcommander.cmd | 12 ------------
 tools/logon.cmd                     | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd
index d260f92..6940f59 100644
--- a/optional/install-totalcommander.cmd
+++ b/optional/install-totalcommander.cmd
@@ -2,8 +2,6 @@
 
 set EXE=..\software\totalcommander-setup.exe
 set KEY=..\personal\wincmd.key
-set INI=..\personal\wincmd.ini
-set FTPCONFIG=..\personal\wcx_ftp.key
 set TARGET=c:\totalcmd
 set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
 set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"
@@ -30,16 +28,6 @@ if EXIST %KEY% (
   copy /Y %KEY% %TARGET%
 )
 
-if EXIST %FTPCONFIG% (
-  echo copying ftp config file ...
-  copy /Y %FTPCONFIG% %TARGET%
-)
-
-if EXIST %INI% (
-  echo copying ini file ...
-  copy /Y %INI% %TARGET%
-)
-
 rem refresh desktop (W10 style)
 ie4uinit.exe -show
 
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 0830891..bf5e62b 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -39,10 +39,22 @@ if NOT EXIST %USERPROFILE%\.vimrc (
 
 rem TOTALCOMMANDER
 if NOT EXIST %APPDATA%\GHISLER\WINCMD.ini (
-  echo setup for TOTALCOMMANDER ...
+  echo copying ini file for TOTALCOMMANDER ...
   mkdir %APPDATA%\GHISLER 1>nul 2>nul
-  copy /Y %TOOLS%\optional\config\WINCMD.ini %APPDATA%\GHISLER
-  copy /Y %TOOLS%\optional\config\wcx_ftp.ini %APPDATA%\GHISLER
+
+  rem ini file ...
+  if EXIST %TOOLS%\personal\WINCMD.ini (
+    copy /Y %TOOLS%\personal\WINCMD.ini %APPDATA%\GHISLER
+  ) else (
+    copy /Y %TOOLS%\optional\config\WINCMD.ini %APPDATA%\GHISLER
+  )
+
+  rem ftp config file ...
+  if EXIST %TOOLS%\personal\wcx_ftp.ini (
+    copy /Y %TOOLS%\personal\wcx_ftp.ini %APPDATA%\GHISLER
+  ) else (
+    copy /Y %TOOLS%\optional\config\wcx_ftp.ini %APPDATA%\GHISLER
+  )
 )
 
 rem WINDOWS TERMINAL