diff --git a/.gitignore b/.gitignore index bc27bf3..61ae237 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,6 @@ log.txt Packages.txt distribution SOFTWAREBKP -tmp/* -personal/* +tmp/ +personal/ diff --git a/PrepareStick.cmd b/PrepareStick.cmd index 73e5828..e48f71f 100644 --- a/PrepareStick.cmd +++ b/PrepareStick.cmd @@ -55,7 +55,7 @@ if EXIST tools ( robocopy tools %USBDRIVE%\tools /COPY:DT /FFT /XO /256 /NJH /NJS /NDL /XF .gitignore ) -for %%P in (software scripts source optional) do ( +for %%P in (software scripts source optional personal) do ( if EXIST %%P ( echo. echo copying folder %%P to drive %USBDRIVE%\tools ... diff --git a/optional/install-purebasic.cmd b/optional/install-purebasic.cmd index b8d8eea..1ea2ec4 100644 --- a/optional/install-purebasic.cmd +++ b/optional/install-purebasic.cmd @@ -3,7 +3,12 @@ set T=c:\TEMP set TOOLS=c:\tools set CONFIG=config\install-purebasic.txt -set EXE=..\software\purebasic-setup.exe + +rem licensed version (exe contains key!) +rem access only for customers ... +set EXE=..\personal\purebasic-setup.exe + +rem demo version (publically accessible) set ZIP=..\software\purebasic.zip echo killing PureBasic processes... @@ -18,7 +23,7 @@ if NOT EXIST %EXE% if NOT EXIST %ZIP% ( echo ####### %0 ####### if EXIST %EXE% ( - echo INFO: %EXE% found! + echo INFO: %EXE% found, installing licensed version ... rem remove old links ... del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul @@ -30,7 +35,7 @@ if EXIST %EXE% ( ) if EXIST %ZIP% ( - echo INFO: %ZIP% found! + echo INFO: %ZIP% found, installing demo version ... rem remove old links ... del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd index 0185470..5f5de29 100644 --- a/optional/install-totalcommander.cmd +++ b/optional/install-totalcommander.cmd @@ -1,6 +1,8 @@ @echo off set EXE=..\software\totalcommander-setup.exe +set KEY=..\personal\wincmd.key +set TARGET=c:\totalcmd if NOT EXIST %EXE% ( echo ERROR: %EXE% not found! @@ -15,6 +17,11 @@ start /wait %EXE% /AHMGDU echo renaming and moving TotalCommander desktop link ... move /Y "%USERPROFILE%\Desktop\Total Commander*" "%PUBLIC%\Desktop\TCM.lnk" +if EXIST %KEY% ( + echo installing license ... + copy /Y %KEY% %TARGET% +) + rem refresh desktop (W10 style) ie4uinit.exe -show diff --git a/scripts/copy-executables.cmd b/scripts/copy-executables.cmd index c8388d0..ab6f95c 100644 --- a/scripts/copy-executables.cmd +++ b/scripts/copy-executables.cmd @@ -2,6 +2,7 @@ set TOOLS=c:\tools set SOFTWARE=..\software +set PERSONAL=..\personal echo ####### %0 ####### @@ -22,4 +23,11 @@ for %%E in ( ) +rem copy licensed snapshot64 executable +rem (license is written to the binary) +if EXIST %PERSONAL%\snapshot64.exe ( + echo installing licensed version of snapshot64 ... + copy /Y %PERSONAL%\snapshot64.exe %TOOLS% +) + echo ####### %0 ####### diff --git a/software/download-from-ftp.cmd b/software/download-from-ftp.cmd index 6b36a39..91f17c7 100644 --- a/software/download-from-ftp.cmd +++ b/software/download-from-ftp.cmd @@ -1,12 +1,13 @@ @echo off +set FTPSETTINGS=..\personal\ftpsettings.cmd rem =================== rem CONFIGFILE CHECK rem =================== -if NOT EXIST ftpsettings.cmd ( +if NOT EXIST %FTPSETTINGS% ( echo. - echo ERROR: ftpsettings.cmd NOT FOUND + echo ERROR: %FTPSETTINGS% NOT FOUND echo. echo --- please create it as follows --- echo set FTP_SERVER=example.com @@ -33,7 +34,7 @@ IF NOT EXIST %LISTFILE% ( echo. echo loading settings ... -call ftpsettings.cmd +call %FTPSETTINGS% echo ++++++++++++++++++ echo FTP_SERVER=%FTP_SERVER% echo FTP_PATH=%FTP_PATH% diff --git a/software/other.csv b/software/other.csv index d3bf4a2..874e99c 100644 --- a/software/other.csv +++ b/software/other.csv @@ -1,4 +1,3 @@ -dummy purebasic-setup.exe dummy citrixreceiver-setup.exe dummy xojo-setup.exe dummy pl2303-setup.exe diff --git a/software/upload-to-ftp-singlefile.cmd b/software/upload-to-ftp-singlefile.cmd index 17faac2..63ae694 100644 --- a/software/upload-to-ftp-singlefile.cmd +++ b/software/upload-to-ftp-singlefile.cmd @@ -1,12 +1,13 @@ @echo off +set FTPSETTINGS=..\personal\ftpsettings.cmd rem =================== rem CONFIGFILE CHECK rem =================== -if NOT EXIST ftpsettings.cmd ( +if NOT EXIST %FTPSETTINGS% ( echo. - echo ERROR: ftpsettings.cmd NOT FOUND + echo ERROR: %FTPSETTINGS% NOT FOUND echo. echo --- please create it as follows --- echo set FTP_SERVER=example.com @@ -30,7 +31,7 @@ IF NOT EXIST %UPLOADFILE% ( echo. echo loading settings ... -call ftpsettings.cmd +call %FTPSETTINGS% echo ++++++++++++++++++ echo FTP_SERVER=%FTP_SERVER% echo FTP_PATH=%FTP_PATH% diff --git a/software/upload-to-ftp.cmd b/software/upload-to-ftp.cmd index 68ac029..ff49ff8 100644 --- a/software/upload-to-ftp.cmd +++ b/software/upload-to-ftp.cmd @@ -1,12 +1,13 @@ @echo off +set FTPSETTINGS=..\personal\ftpsettings.cmd rem =================== rem CONFIGFILE CHECK rem =================== -if NOT EXIST ftpsettings.cmd ( +if NOT EXIST %FTPSETTINGS% ( echo. - echo ERROR: ftpsettings.cmd NOT FOUND + echo ERROR: %FTPSETTINGS% NOT FOUND echo. echo --- please create it as follows --- echo set FTP_SERVER=example.com @@ -33,7 +34,7 @@ IF NOT EXIST %LISTFILE% ( echo. echo loading settings ... -call ftpsettings.cmd +call %FTPSETTINGS% echo ++++++++++++++++++ echo FTP_SERVER=%FTP_SERVER% echo FTP_PATH=%FTP_PATH% diff --git a/tools/logon.cmd b/tools/logon.cmd index abf4653..34aade0 100644 --- a/tools/logon.cmd +++ b/tools/logon.cmd @@ -53,6 +53,10 @@ if NOT EXIST %LOCALSTATE%\settings.json ( ) if EXIST %STATUSFILE% GOTO END + +echo deploying SSH keys ... +copy /Y %TOOLS%\personal\id*.* %USERPROFILE%\.ssh\config 2>nul + echo. echo ##### echo ##### USER TWEAKS