From 49eab9da295908fe427d74ee0085c513f580e2e2 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Sat, 13 Mar 2021 18:53:25 +0100 Subject: [PATCH] added some links, added java install script, added bfg --- .gitignore | 1 + optional/install-java.cmd | 19 +++++++++++++++++ optional/install-softmaker.cmd | 32 +++++++++++++++++++++++++++++ scripts/autoconfig-all.cmd | 20 +++++++++++------- scripts/copy-executables.cmd | 25 ++++++++++++++++++++++ scripts/copy-exefiles.cmd | 24 ---------------------- scripts/disable-accountpicture.cmd | 18 ++++++++++------ scripts/modify-path.cmd | 2 +- scripts/startmenu/PuTTYgen.lnk | Bin 0 -> 955 bytes scripts/startmenu/ShowKeyPlus.lnk | Bin 0 -> 982 bytes scripts/startmenu/WUB.lnk | Bin 0 -> 904 bytes scripts/unpack-zipfiles.cmd | 6 ++++++ software/basic.csv | 7 +++++-- software/optional.csv | 16 ++++++++------- software/other.csv | 2 +- tools/bfg.cmd | 5 +++++ tools/pbc.cmd | 1 + 17 files changed, 130 insertions(+), 48 deletions(-) create mode 100644 optional/install-java.cmd create mode 100644 scripts/copy-executables.cmd delete mode 100644 scripts/copy-exefiles.cmd create mode 100644 scripts/startmenu/PuTTYgen.lnk create mode 100644 scripts/startmenu/ShowKeyPlus.lnk create mode 100644 scripts/startmenu/WUB.lnk create mode 100644 tools/bfg.cmd diff --git a/.gitignore b/.gitignore index 6db6f50..bc27bf3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ Packages.txt distribution SOFTWAREBKP tmp/* +personal/* diff --git a/optional/install-java.cmd b/optional/install-java.cmd new file mode 100644 index 0000000..d255b00 --- /dev/null +++ b/optional/install-java.cmd @@ -0,0 +1,19 @@ +@echo off + +set CONFIG=config\install-java.txt +set EXE=..\software\java-setup.exe + +if NOT EXIST %EXE% ( + echo ERROR: %EXE% not found! + exit /b +) + +echo ####### %0 ####### + +echo installing JAVA ... +start /wait %EXE% INSTALL_SILENT=Enable AUTO_UPDATE=0 NOSTARTMENU=1 REBOOT=0 ^ + INSTALLDIR="%ProgramFiles%\java" + +echo ####### %0 ####### +pause + diff --git a/optional/install-softmaker.cmd b/optional/install-softmaker.cmd index e1144e7..54a1fe3 100644 --- a/optional/install-softmaker.cmd +++ b/optional/install-softmaker.cmd @@ -3,12 +3,24 @@ set OPT=..\optional set SOFTWARE=..\software set MSI=softmaker-setup.msi +set SETTINGS=..\personal\settings.cmd +set softmaker_license=0 if NOT EXIST %SOFTWARE%\%MSI% ( echo ERROR: %SOFTWARE%\%MSI% not found! exit /b ) +rem =================== +rem CONFIGFILE CHECK +rem =================== + +if NOT EXIST %SETTINGS% ( + echo. + echo WARNING: %SETTINGS% NOT FOUND + echo. +) + echo ####### %0 ####### cd %SOFTWARE% @@ -30,6 +42,26 @@ copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 20 rem refresh desktop (W10 style) ie4uinit.exe -show +echo disabling automatic updates for Softmaker Office 2021 ... +reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^ + /v "UpdateCheckEnabled" /d 0 /t REG_DWORD /f + +echo disabling WEB help ... +reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^ + /v "HelpSoftMaker" /d 0 /t REG_DWORD /f + +echo disabling the asking for user info ... +reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^ + /v "AskUserInfo" /d 0 /t REG_DWORD /f + +if softmaker_license == 0 ( + echo no softmaker license found! +) else ( + echo adding softmaker license ... + reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^ + /v "ProductKey" /d "115081474870" /t REG_SZ /f +) + echo ####### %0 ####### pause diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd index 6a82424..261b61f 100644 --- a/scripts/autoconfig-all.cmd +++ b/scripts/autoconfig-all.cmd @@ -23,12 +23,18 @@ echo cd to %SCRIPTS% ... cd /D %SCRIPTS% echo. -echo loading settings ... -call settings.cmd -echo ++++++++++++++++++ -echo windows_updates=%windows_updates% -echo ++++++++++++++++++ -echo. +if EXIST settings.cmd ( + echo loading settings ... + call settings.cmd + echo ++++++++++++++++++ + echo windows_updates=%windows_updates% + echo ++++++++++++++++++ + echo. +) else ( + echo WARNING: settings.cmd not found! + echo setting defaults ... + set windows_updates=1 +) rem 7-zip is essential for other scripts ... call unpack-7zip.cmd @@ -43,7 +49,7 @@ call unpack-vnc.cmd echo. rem copy some other stuff ... -call copy-exefiles.cmd +call copy-executables.cmd echo. echo ####################### diff --git a/scripts/copy-executables.cmd b/scripts/copy-executables.cmd new file mode 100644 index 0000000..c8388d0 --- /dev/null +++ b/scripts/copy-executables.cmd @@ -0,0 +1,25 @@ +@echo off + +set TOOLS=c:\tools +set SOFTWARE=..\software + +echo ####### %0 ####### + +for %%E in ( + + bfg.jar + snapshot64.exe + puttygen.exe + +) do ( + + if NOT EXIST %SOFTWARE%\%%E ( + echo WARNING: %SOFTWARE%\%%E not found! + ) else ( + echo copying %%E to %TOOLS% ... + copy /Y %SOFTWARE%\%%E %TOOLS% + ) + +) + +echo ####### %0 ####### diff --git a/scripts/copy-exefiles.cmd b/scripts/copy-exefiles.cmd deleted file mode 100644 index 3bebd4c..0000000 --- a/scripts/copy-exefiles.cmd +++ /dev/null @@ -1,24 +0,0 @@ -@echo off - -set TOOLS=c:\tools -set SOFTWARE=..\software - -echo ####### %0 ####### - -for %%E in ( - - snapshot64 - puttygen - -) do ( - - if NOT EXIST %SOFTWARE%\%%E.exe ( - echo WARNING: %SOFTWARE%\%%E.exe not found! - ) else ( - echo copy %%E.exe to %TOOLS% ... - copy /Y %SOFTWARE%\%%E.exe %TOOLS% - ) - -) - -echo ####### %0 ####### diff --git a/scripts/disable-accountpicture.cmd b/scripts/disable-accountpicture.cmd index 3ca7cfd..9dff140 100644 --- a/scripts/disable-accountpicture.cmd +++ b/scripts/disable-accountpicture.cmd @@ -7,12 +7,18 @@ set LOGO=config\user-empty.png echo ####### %0 ####### -echo loading settings ... -call settings.cmd -echo ++++++++++++++++++ -echo logon_logo=%logon_logo% -echo ++++++++++++++++++ -echo. +if EXIST settings.cmd ( + echo loading settings ... + call settings.cmd + echo ++++++++++++++++++ + echo logon_logo=%logon_logo% + echo ++++++++++++++++++ + echo. +) else ( + echo WARNING: settings.cmd not found! + echo setting defaults ... + set logon_logo=1 +) if %logon_logo% == 1 ( rem windows logo taken from: http://pngimg.com/image/23601 diff --git a/scripts/modify-path.cmd b/scripts/modify-path.cmd index 2a8f1a0..628fdc4 100644 --- a/scripts/modify-path.cmd +++ b/scripts/modify-path.cmd @@ -11,7 +11,7 @@ set newPATH=%SYSTEMROOT%;%SYSTEMROOT%\system32;^ %ProgramFiles%\Go\bin;^ %SystemDrive%\Python27;^ %ProgramFiles%\Python39;^ -%ProgramFiles%\FarManager +%ProgramFiles%\Java\bin echo ####### %0 ####### diff --git a/scripts/startmenu/PuTTYgen.lnk b/scripts/startmenu/PuTTYgen.lnk new file mode 100644 index 0000000000000000000000000000000000000000..9c6a4b8eab118d297357ce23a23f174753e5f75d GIT binary patch literal 955 zcmeZaU|?VrVFHp23lQ`k#Xu1ehBO8v29VRVg4Sj# zFcg%QlvJjt=INzYq%tsgLCpop9OzWm1p z;U&dsN}51%ux0W<1~(8RoTk8_0d_7(2?VSKQXoSNKB{hi?=B^<^dnP3&%D=bbb;dF zlm#+`7l?8BA1K8j3dH;%h69Lzrc96^4~P$9z>=vdkj(-T1Q`o5-w_z4<=}`-0Y-El zFp?n}_<%HuaUgyq5Q7}MEGt>VcIqX;t=AY1_}`ScU<(wN11SKRDh9;pQGz@AK)M(h zEP)tg@J6v*m$khG9?Lx(^p@CG^vD9mGe8PFfcSa;*4VZu>)mz*-8rbQ`tLYM90mX~ C+{Y6D literal 0 HcmV?d00001 diff --git a/scripts/startmenu/ShowKeyPlus.lnk b/scripts/startmenu/ShowKeyPlus.lnk new file mode 100644 index 0000000000000000000000000000000000000000..4efe30d8dd538e0e416112c25be92723a18b7af8 GIT binary patch literal 982 zcmah{UuaTc6#rfG!Bs3rHn*rv7J{p|(|RduVVKi!;YDGMFj%EaL+8-R+)F`gL9h}A z6_u5RHHf12AVpBDry_{C!1ae7DuN)1AyMrqI_J81sfX>m{La67&hIOGtL$t4WF>!6G|R?}ZU924b;D0y|LyHD;f-di4)DE>gyToOMDel&y28 zrsz+Mz6cT&(UIN)ZmlTYuo~cVdG@;<$1S3x+W|=PyxTm&=AvZZ!MvYyeC#oqO%WHT z>jfV|#5)K#f*7LO2$HmiNM4EntRw83*E|IFw-R`D67+;+gpI#Oc4#UjaQ5Htq) zlzv|*Hs}rxNs(ki45o;&iO5Cx|B=e!{8+pp4eYQ|wNlYjX&~E8npbZ)9y}b52Pz&g z7f1%+2unF5P$a4={a7|fMq(08_qfh$5V0vHUzoZO&ktpW@s z`T04;3^oj$3@i-q_h|-+Zvctw0acWMRn;Rjf?0hn=YcZ$K$yc&3=|Pz2xBl}068r< zFtbE~p}aInFSR0-!2xPwL=c-l2!l+lSPJrRE7%+a@uQlRv7DilA&EhcA(f#5h#45f zfY=p?Wq=suT@Y;y#30}T#Nt5A48&UBTI~dYbXa~)X>KY5(8FN=#K2quG)NB!V^Bzh z^J5rLE#_cwX0QUPMyN=DShOGlNP|FHW>IQVW>E@+$H4HTsCeu79Si(txla0gQQUzg z;w#gsht01An*t2xD6irxAS7P{^c^Py!vc_J4TA%M-x}<_<;>9OzWm1p;U&dsN}51% zux0W<1~(8RoTk8_0d_7(2?Q(zQXoSNKB{hi?=B^<^dnP3&%D=b6oKMgASEC}IDi<{ z*9;7zKrwzG2F4l?uz7)#A4re~#0N28X-^f%W&sI;i~^bI$dCs#E)__o0OK%^Asr|N z(g04X4nPJh^#Yj;fj|s$;Igb_4cn=g1h-yeIN*O%;({qqTn?lFWU3$#qelaJM1j$0}Dz+<_GgWeL`iXK^@cm_y;2M|B+-x}NYWWC$2pgRZkRsS6aiNgQ@ DTEMqs literal 0 HcmV?d00001 diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd index f77e974..9cb2655 100644 --- a/scripts/unpack-zipfiles.cmd +++ b/scripts/unpack-zipfiles.cmd @@ -21,6 +21,7 @@ for %%A in ( regscanner restic setacl + showkeyplus vim winscp wub @@ -93,6 +94,11 @@ move /Y %T%\setacl\*.exe %TOOLS%\setacl.exe rd /S /Q %T%\setacl echo. +echo ShowKeyPlus +move /Y %T%\showkeyplus\*.exe %TOOLS% +rd /S /Q %T%\showkeyplus +echo. + echo VIM move /Y %T%\vim\vim.exe %TOOLS% rd /S /Q %T%\vim diff --git a/software/basic.csv b/software/basic.csv index 2856d91..ed801d8 100644 --- a/software/basic.csv +++ b/software/basic.csv @@ -19,6 +19,9 @@ https://golang.org/dl/go1.16.windows-amd64.msi go-setup.msi https://www.python.org/ftp/python/3.9.2/python-3.9.2-amd64.exe python3-setup.exe https://www.nirsoft.net/utils/regscanner-x64.zip regscanner.zip http://www.drivesnapshot.de/download/snapshot64.exe snapshot64.exe -https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe -https://github.com/microsoft/terminal/releases/download/v1.5.10411.0/Microsoft.WindowsTerminal_1.5.10411.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle https://helgeklein.com/downloads/SetACL/current/SetACL%20(executable%20version).zip setacl.zip +https://github.com/Superfly-Inc/ShowKeyPlus/releases/download/ShowKeyPlus1.1.14.1/ShowKeyPlus1.1.14.1.zip showkeyplus.zip +https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe +https://www.heidoc.net/php/Windows-ISO-Downloader.exe Windows-ISO-Downloader.exe +https://github.com/microsoft/terminal/releases/download/v1.5.10411.0/Microsoft.WindowsTerminal_1.5.10411.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle + diff --git a/software/optional.csv b/software/optional.csv index 1852f5a..4f7af17 100644 --- a/software/optional.csv +++ b/software/optional.csv @@ -1,18 +1,20 @@ -https://download.sp.f-secure.com/SE/Retail/installer/F-SecureNetworkInstaller-AV.exe f-securenetworkinstaller-av_avtr20f930_.exe +https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar bfg.jar https://github.com/sqlitebrowser/sqlitebrowser/releases/download/v3.12.1/DB.Browser.for.SQLite-3.12.1-win64-v2.msi dbbrowser-setup.msi https://www.emclient.com/dist/v8.1.1060/setup.msi emclient-setup.msi +https://download.sp.f-secure.com/SE/Retail/installer/F-SecureNetworkInstaller-AV.exe f-securenetworkinstaller-av_avtr20f930_.exe https://dl.google.com/drive/gsync_enterprise64.msi gsync-setup.msi +https://github.com/ClusterM/hakchi2/releases/download/v2.32/hakchi2.zip hakchi2.zip https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-2012-8.1.0-17349995.exe horizon-setup.exe +https://github.com/mamedev/mame/releases/download/mame0186/mame0186b_64bit.exe mame64.7z +https://matrica.de/download/windows/moneyplex_20_setup.exe moneyplex-setup.exe +https://www.purebasic.com/download/PureBasic_Demo_x64.zip purebasic.zip +https://www.python.org/ftp/python/2.7.18/python-2.7.18.amd64.msi python2-setup.msi https://www.softmaker.net/down/ofw2021_64.msi softmaker-setup.msi http://download.spotify.com/SpotifyFullSetup.exe spotify-setup.exe +https://cdn.akamai.steamstatic.com/client/installer/SteamSetup.exe steam-setup.exe https://statics.teams.cdn.office.net/production-windows-x64/1.4.00.2879/Teams_windows_x64.exe teams-setup.exe https://totalcommander.ch/win/fixed/tcmd951x64.exe totalcommander-setup.exe https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18-142142-Win.exe virtualbox-setup.exe https://code.visualstudio.com/sha/download?build=stable&os=win32-x64 vscode-setup.exe https://download.xnview.com/XnViewMP-win-x64.exe xnview-setup.exe -https://www.purebasic.com/download/PureBasic_Demo_x64.zip purebasic.zip -https://matrica.de/download/windows/moneyplex_20_setup.exe moneyplex-setup.exe -https://www.python.org/ftp/python/2.7.18/python-2.7.18.amd64.msi python2-setup.msi -https://github.com/ClusterM/hakchi2/releases/download/v2.32/hakchi2.zip hakchi2.zip -https://cdn.akamai.steamstatic.com/client/installer/SteamSetup.exe steam-setup.exe -https://github.com/mamedev/mame/releases/download/mame0186/mame0186b_64bit.exe mame64.7z + diff --git a/software/other.csv b/software/other.csv index c00a8c8..d3bf4a2 100644 --- a/software/other.csv +++ b/software/other.csv @@ -1,8 +1,8 @@ dummy purebasic-setup.exe dummy citrixreceiver-setup.exe dummy xojo-setup.exe -dummy xojo.license dummy pl2303-setup.exe dummy wfc5210-setup.exe dummy cyberjack-setup.exe +dummy jre64-setup.exe diff --git a/tools/bfg.cmd b/tools/bfg.cmd new file mode 100644 index 0000000..88ac022 --- /dev/null +++ b/tools/bfg.cmd @@ -0,0 +1,5 @@ +@echo off +set TOOLS=c:\tools + +java -jar %TOOLS%\bfg.jar + diff --git a/tools/pbc.cmd b/tools/pbc.cmd index 79c3c90..6da2227 100644 --- a/tools/pbc.cmd +++ b/tools/pbc.cmd @@ -13,3 +13,4 @@ GOTO END echo "usage: %0 " :END +