From 03aca37e7dbf448fbfbf5e0dcae40ec830472718 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Sun, 10 Jan 2021 16:42:07 +0100 Subject: [PATCH] . --- CustomSetup.cmd | 12 ++++++-- scripts/icons/CMD.lnk | Bin 1780 -> 1776 bytes scripts/install-antivir.cmd | 12 +------- scripts/install-desktopicons.cmd | 2 +- scripts/install-firefox.cmd | 46 ++++++++++--------------------- scripts/install-git.cmd | 3 -- scripts/install-logonscript.cmd | 11 ++++++-- scripts/install-openshell.cmd | 13 ++++----- scripts/install-tweaks.cmd | 2 +- scripts/uninstall-edge.cmd | 5 ++-- 10 files changed, 42 insertions(+), 64 deletions(-) diff --git a/CustomSetup.cmd b/CustomSetup.cmd index 8576e94..09b22ea 100644 --- a/CustomSetup.cmd +++ b/CustomSetup.cmd @@ -1,8 +1,6 @@ @echo off set T=c:\TEMP set TOOLS=c:\tools -mkdir %USERPROFILE%\workspace 1>nul 2>nul -mkdir %USERPROFILE%\.ssh 1>nul 2>nul echo ####### %0 ####### @@ -25,7 +23,7 @@ rd /S /Q %TOOLS% echo copying folder tools to %TOOLS% ... robocopy tools %TOOLS% /MIR /256 /NJH /NFL /NDL -rem chdir to scripts folder ... +rem cd to scripts folder ... cd scripts echo unpacking BGInfo ... @@ -61,6 +59,14 @@ reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Env /d "%TOOLS%\usr\bin\ssh.exe" ^ /f +rem copy files in deploy folder to tools directory ... +copy /Y deploy\* %TOOLS% + +rem create directories for current user ... +mkdir %USERPROFILE%\workspace 1>nul 2>nul +mkdir %USERPROFILE%\.ssh 1>nul 2>nul +copy /Y %TOOLS%\ssh_config %USERPROFILE%\.ssh\config + rem installing startup links ... call install-logonscript.cmd diff --git a/scripts/icons/CMD.lnk b/scripts/icons/CMD.lnk index 99a6dbd9c226dfa2f4b1bed6065748e564595e61..b0a1faf561cac7c6edd28d37fec52d1042f8b11d 100644 GIT binary patch delta 34 ocmeyu`+;|ZHIt}3gFb^dg91Y`gB3#zLkUAZ5aw(SVOqcf0F{LZ9smFU delta 38 scmeys`-OLdHIt+wgFb^dg91Y`gB3#zLotvpV#s7DU?|xfz_fq`0JU!j_W%F@ diff --git a/scripts/install-antivir.cmd b/scripts/install-antivir.cmd index 27a9384..0c34ae6 100644 --- a/scripts/install-antivir.cmd +++ b/scripts/install-antivir.cmd @@ -1,21 +1,11 @@ @echo off -set T=c:\TEMP -mkdir %T% 1>nul 2>nul -cd /D %T% -set EXE=F-SecureNetworkInstaller-AV_AVTR20F930_.exe -set URL="ftp://w10install:9054c6cf-c54c@exabyte-systems.com/software/%EXE%" +set EXE=..\software\F-SecureNetworkInstaller-AV_AVTR20F930_.exe echo ####### %0 ####### -echo download ... -curl --ftp-pasv %URL% --output %EXE% - echo installing F-Secure Antivirus ... %EXE% --silent -rem cleanup ... -del /Q %EXE% 1>nul 2>nul - echo ####### %0 ####### diff --git a/scripts/install-desktopicons.cmd b/scripts/install-desktopicons.cmd index 9ed72ae..ed75c7d 100644 --- a/scripts/install-desktopicons.cmd +++ b/scripts/install-desktopicons.cmd @@ -1,6 +1,6 @@ @echo off -set SOURCE=desktopicons +set SOURCE=icons set TARGET=c:\Users\Public\Desktop echo ####### %0 ####### diff --git a/scripts/install-firefox.cmd b/scripts/install-firefox.cmd index 3f3badc..cc8ed9b 100644 --- a/scripts/install-firefox.cmd +++ b/scripts/install-firefox.cmd @@ -1,34 +1,31 @@ @echo off -set T=c:\TEMP -mkdir %T% 1>nul 2>nul -cd /D %T% -set CONF=c:\scripts\conf -set URL="ftp://w10install:9054c6cf-c54c@exabyte-systems.com/software/firefox" +set CONF=deploy\firefox +set SCRIPTS=..\..\scripts +set SOFTWARE=..\software\firefox set MSI=Firefox_Setup_83.0b9.msi set FIREFOXBASE="C:\Program Files\Mozilla Firefox" -set BADGERFILE=privacy_badger-2020.12.10.xpi +set BADGERFILE=%SOFTWARE%\privacy_badger-2020.12.10.xpi set BADGERTARGET=jid1-MnnxcxisBPnSXQ@jetpack.xpi -set UBLOCKFILE=ublock_origin-1.32.0.xpi +set UBLOCKFILE=%SOFTWARE%\ublock_origin-1.32.0.xpi set UBLOCKTARGET=uBlock0@raymondhill.net.xpi -set PASSWORD1FILE=1password-1.22.3.xpi +set PASSWORD1FILE=%SOFTWARE%\1password-1.22.3.xpi set PASSWORD1TARGET={d634138d-c276-4fc8-924b-40a0ea21d284}.xpi -set BITWARDENFILE=bitwarden-1.47.1.xpi +set BITWARDENFILE=%SOFTWARE%\bitwarden-1.47.1.xpi set BITWARDENTARGET={446900e4-71c2-419f-a6a7-df9c091e268b}.xpi echo ####### %0 ####### -echo download ... -curl --ftp-pasv %URL%/%MSI% --output %MSI% - +cd %SOFTWARE% @echo on msiexec /i %MSI% /passive @echo off +cd %SCRIPTS% rem copy config ... copy /Y %CONF%\local-settings.js %FIREFOXBASE%\defaults\pref @@ -49,34 +46,19 @@ reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Mozilla\Firefox" ^ /f echo creating extensions directory ... -mkdir %FIREFOXBASE%\distribution\extensions - -echo download ... -curl --ftp-pasv %URL%/%BADGERFILE% --output %BADGERFILE% +mkdir %FIREFOXBASE%\distribution\extensions 1>nul 2>nul echo installing badger(eff) to fight internet bullshit ... -move /Y %BADGERFILE% %FIREFOXBASE%\distribution\extensions\%BADGERTARGET% - -echo download ... -curl --ftp-pasv %URL%/%UBLOCKFILE% --output %UBLOCKFILE% +copy /Y %BADGERFILE% %FIREFOXBASE%\distribution\extensions\%BADGERTARGET% echo installing uBlock to fight even more internet bullshit ... -move /Y %UBLOCKFILE% %FIREFOXBASE%\distribution\extensions\%UBLOCKTARGET% - -echo download ... -curl --ftp-pasv %URL%/%PASSWORD1FILE% --output %PASSWORD1FILE% +copy /Y %UBLOCKFILE% %FIREFOXBASE%\distribution\extensions\%UBLOCKTARGET% echo installing 1Password plugin ... -move /Y %PASSWORD1FILE% %FIREFOXBASE%\distribution\extensions\%PASSWORD1TARGET% - -echo download ... -curl --ftp-pasv %URL%/%BITWARDENFILE% --output %BITWARDENFILE% +copy /Y %PASSWORD1FILE% %FIREFOXBASE%\distribution\extensions\%PASSWORD1TARGET% echo installing Bitwarden plugin ... -move /Y %BITWARDENFILE% %FIREFOXBASE%\distribution\extensions\%BITWARDENTARGET% - -rem cleanup ... -del /Q %MSI% 1>nul 2>nul +copy /Y %BITWARDENFILE% %FIREFOXBASE%\distribution\extensions\%BITWARDENTARGET% echo ####### %0 ####### diff --git a/scripts/install-git.cmd b/scripts/install-git.cmd index 0c18f3f..8cc23f5 100644 --- a/scripts/install-git.cmd +++ b/scripts/install-git.cmd @@ -1,7 +1,4 @@ @echo off -set T=c:\TEMP -mkdir %T% 1>nul 2>nul -cd /D %T% set CONFIG=install-git.txt set EXE=..\software\Git-2.29.0-64-bit.exe diff --git a/scripts/install-logonscript.cmd b/scripts/install-logonscript.cmd index 4a48342..10d7f39 100644 --- a/scripts/install-logonscript.cmd +++ b/scripts/install-logonscript.cmd @@ -1,13 +1,20 @@ @echo off set SOURCE=deploy/logon.cmd +set TOOLS=c:\tools set TARGET="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Startup" echo ####### %0 ####### -echo create link for logon script... +rem cleanup ... del /Q /F %TARGET%\logon* 1>nul 2>nul -mklink %TARGET%\logon.cmd %SOURCE% +del /Q /F %TOOLS%\logon.cmd 1>nul 2>nul + +echo copy logon.cmd to %TOOLS% ... +copy /Y %SOURCE% %TOOLS% + +echo create link for logon script... +mklink %TARGET%\logon.cmd %TOOLS%\logon.cmd echo create link on desktop... del /Q /F "%USERPROFILE%\Desktop\Autostart*" 1>nul 2>nul diff --git a/scripts/install-openshell.cmd b/scripts/install-openshell.cmd index db2d005..5cd2f14 100644 --- a/scripts/install-openshell.cmd +++ b/scripts/install-openshell.cmd @@ -1,17 +1,14 @@ @echo off -set T=c:\TEMP -mkdir %T% 1>nul 2>nul -cd /D %T% + +set SCRIPTS=..\scripts +set SOFTWARE=..\software set EXE=OpenShellSetup_4_4_160.exe set MSI=OpenShellSetup64_4_4_160.msi -set URL="ftp://w10install:9054c6cf-c54c@exabyte-systems.com/software/%EXE%" echo ####### %0 ####### -echo download ... -curl --ftp-pasv %URL% --output %EXE% - +cd %SOFTWARE% @echo on %EXE% extract64 msiexec /i %MSI% ADDLOCAL=StartMenu,ClassicExplorer /passive @@ -19,7 +16,7 @@ msiexec /i %MSI% ADDLOCAL=StartMenu,ClassicExplorer /passive rem cleanup ... del /Q %MSI% 1>nul 2>nul -del /Q %EXE% 1>nul 2>nul +cd %SCRIPTS echo ####### %0 ####### diff --git a/scripts/install-tweaks.cmd b/scripts/install-tweaks.cmd index d113c73..f4616c8 100644 --- a/scripts/install-tweaks.cmd +++ b/scripts/install-tweaks.cmd @@ -1,5 +1,5 @@ @echo off -set TARGET=c:\scripts\tweaks +set TARGET=tweaks echo ####### %0 ####### diff --git a/scripts/uninstall-edge.cmd b/scripts/uninstall-edge.cmd index 886f4b5..59d7163 100644 --- a/scripts/uninstall-edge.cmd +++ b/scripts/uninstall-edge.cmd @@ -1,12 +1,11 @@ @echo off set EDGEROOT="C:\Program Files (x86)\Microsoft\Edge" +set INSTALLER=Application\8*\Installer echo ####### %0 ####### -cd /D C:\ -cd %EDGEROOT%\Application\8*\Installer -setup.exe --uninstall --system-level --verbose-logging --force-uninstall +%EDGEROOT%\%INSTALLER%\setup.exe --uninstall --system-level --verbose-logging --force-uninstall rd /S /Q %EDGEROOT% echo ####### %0 #######