From 1b8ec9637903f82e22c9ce0d796664b5c584439a Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Sat, 18 Nov 2017 22:50:58 -0800
Subject: [PATCH 01/20] New update scripts
# Plan #
* Repo should be in a non-functional state
* This is to avoid confusion when most, if not all, scripts fail to run when first downloaded.
* The first step should be to run Build Kit.cmd which does the following
* Downloads 7-Zip, ConEmu, Notepad++, & Python (including wheel packages)
* (i.e. just enough to run update_kit.py)
* Open .bin/Scripts/settings/main.py in Notepad++ for configuration
* Move the kit folders into place
* (i.e. /.root_items/* ->> /, /Build Kit.cmd --> /.bin/Scripts/Build Kit.cmd, etc)
* Added Build Kit.cmd
* Launches build_kit.ps1
* Added build_kit.ps1
* Downloads 7-Zip, ConEmu, and Python
* Launches update_kit.py unless errors are encountered
* Removed all launchers
* update_kit.py will generate them in a future update
---
.bin/ConEmu/ConEmu.xml | 787 ++++++++++++++++
.../Scripts/Copy WizardKit.cmd | 0
.bin/Scripts/Launcher_Template.cmd | 12 +-
.bin/Scripts/_Update Kit.cmd | 126 ---
.bin/Scripts/build_kit.ps1 | 170 ++++
.bin/Scripts/settings/launchers.py | 857 ++++++++++++++++++
.bin/Scripts/update_kit.py | 3 +
.gitignore | 26 +-
.../Drivers}/Extras/AMD.url | 0
.../Dell (FTP - Browse for Drivers).url | 0
.../Extras/Dell (Simplified Interface).url | 0
.../Drivers}/Extras/Dell (Support Site).url | 0
.../Drivers}/Extras/Device Remover.url | 0
.../Extras/Display Driver Uninstaller.url | 0
.../Drivers}/Extras/HP.url | 0
.../Intel Driver & Support Assistant.url | 0
.../Drivers}/Extras/NVIDIA.url | 0
.../Extras/Samsung Tools & Software.url | 0
.../Installers}/BackBlaze.url | 0
.../Misc}/Fix Missing Optical Drive.reg | 0
.../Misc}/Nirsoft Utilities - Outlook.url | 0
.../Misc}/Nirsoft Utilities - Passwords.url | 0
.../Misc}/Sysinternals Suite (Live).url | 0
.../AV Removal Tools/AV Removal Tools.url | 0
.../Uninstallers}/AV Removal Tools/AVG.url | 0
.../Uninstallers}/AV Removal Tools/Avast.url | 0
.../Uninstallers}/AV Removal Tools/Avira.url | 0
.../Uninstallers}/AV Removal Tools/ESET.url | 0
.../AV Removal Tools/Kaspersky.url | 0
.../Uninstallers}/AV Removal Tools/MBAM.url | 0
.../Uninstallers}/AV Removal Tools/McAfee.url | 0
.../Uninstallers}/AV Removal Tools/Norton.url | 0
Activate Windows.cmd | 126 ---
Build Kit.cmd | 53 ++
Data Recovery/PhotoRec (CLI).cmd | 126 ---
Data Recovery/PhotoRec.cmd | 126 ---
Data Recovery/TestDisk.cmd | 126 ---
Data Transfers/FastCopy (as ADMIN).cmd | 127 ---
Data Transfers/FastCopy.cmd | 127 ---
Data Transfers/KVRT.cmd | 129 ---
Data Transfers/Transferred Keys.cmd | 126 ---
Data Transfers/User Data Transfer.cmd | 126 ---
Data Transfers/XYplorer (as ADMIN).cmd | 126 ---
Data Transfers/XYplorer.cmd | 126 ---
Diagnostics/Extras/AIDA64.cmd | 126 ---
.../Autoruns (with VirusTotal Scan).cmd | 138 ---
Diagnostics/Extras/BleachBit.cmd | 126 ---
Diagnostics/Extras/BlueScreenView.cmd | 126 ---
Diagnostics/Extras/ERUNT.cmd | 127 ---
Diagnostics/Extras/HWiNFO (Sensors).cmd | 134 ---
Diagnostics/Extras/HitmanPro.cmd | 127 ---
Diagnostics/HWiNFO.cmd | 134 ---
Diagnostics/ProduKey.cmd | 132 ---
Drivers/Extras/Acer.cmd | 137 ---
Drivers/Extras/Lenovo.cmd | 137 ---
Drivers/Extras/Toshiba.cmd | 137 ---
Drivers/Intel RST (Current Release).cmd | 126 ---
Drivers/Intel RST (Previous Releases).cmd | 126 ---
Drivers/Intel SSD Toolbox.cmd | 126 ---
Drivers/Samsing Magician.cmd | 126 ---
Drivers/Snappy Driver Installer.cmd | 126 ---
Enter SafeMode.cmd | 126 ---
Exit SafeMode.cmd | 126 ---
.../2013/Home and Business 2013 (x32).cmd | 125 ---
.../2013/Home and Business 2013 (x64).cmd | 125 ---
.../2013/Home and Student 2013 (x32).cmd | 125 ---
.../2013/Home and Student 2013 (x64).cmd | 125 ---
.../2016/Home and Business 2016 (x32).cmd | 125 ---
.../2016/Home and Business 2016 (x64).cmd | 125 ---
.../2016/Home and Student 2016 (x32).cmd | 125 ---
.../2016/Home and Student 2016 (x64).cmd | 125 ---
.../Office/2016/Office 365 2016 (x32).cmd | 125 ---
.../Office/2016/Office 365 2016 (x64).cmd | 125 ---
.../QuickBooks/2015/QuickBooksPremier2015.cmd | 124 ---
.../QuickBooks/2015/QuickBooksPro2015.cmd | 124 ---
.../QuickBooks/2016/QuickBooksPremier2016.cmd | 124 ---
.../QuickBooks/2016/QuickBooksPro2016.cmd | 124 ---
.../QuickBooks/2017/QuickBooksPremier2017.cmd | 124 ---
.../QuickBooks/2017/QuickBooksPro2017.cmd | 124 ---
Installers/SW Bundle.cmd | 126 ---
Misc/ConEmu (as ADMIN).cmd | 126 ---
Misc/ConEmu.cmd | 126 ---
Misc/Everything.cmd | 126 ---
Misc/Notepad++.cmd | 126 ---
Misc/TreeSizeFree.cmd | 126 ---
Misc/XMPlay.cmd | 126 ---
Repairs/AdwCleaner.cmd | 126 ---
Repairs/Autoruns.cmd | 138 ---
Repairs/CHKDSK.cmd | 126 ---
Repairs/DISM.cmd | 126 ---
Repairs/KVRT.cmd | 129 ---
Repairs/RKill.cmd | 131 ---
Repairs/SFC Scan.cmd | 126 ---
Repairs/TDSSKiller.cmd | 129 ---
System Checklist.cmd | 126 ---
System Diagnostics.cmd | 126 ---
Uninstallers/IObit Uninstaller.cmd | 126 ---
User Checklist.cmd | 126 ---
98 files changed, 1890 insertions(+), 8409 deletions(-)
create mode 100644 .bin/ConEmu/ConEmu.xml
rename Copy WizardKit.cmd => .bin/Scripts/Copy WizardKit.cmd (100%)
delete mode 100644 .bin/Scripts/_Update Kit.cmd
create mode 100644 .bin/Scripts/build_kit.ps1
create mode 100644 .bin/Scripts/settings/launchers.py
rename {Drivers => .root_items/Drivers}/Extras/AMD.url (100%)
rename {Drivers => .root_items/Drivers}/Extras/Dell (FTP - Browse for Drivers).url (100%)
rename {Drivers => .root_items/Drivers}/Extras/Dell (Simplified Interface).url (100%)
rename {Drivers => .root_items/Drivers}/Extras/Dell (Support Site).url (100%)
rename {Drivers => .root_items/Drivers}/Extras/Device Remover.url (100%)
rename {Drivers => .root_items/Drivers}/Extras/Display Driver Uninstaller.url (100%)
rename {Drivers => .root_items/Drivers}/Extras/HP.url (100%)
rename {Drivers => .root_items/Drivers}/Extras/Intel Driver & Support Assistant.url (100%)
rename {Drivers => .root_items/Drivers}/Extras/NVIDIA.url (100%)
rename {Drivers => .root_items/Drivers}/Extras/Samsung Tools & Software.url (100%)
rename {Installers => .root_items/Installers}/BackBlaze.url (100%)
rename {Misc => .root_items/Misc}/Fix Missing Optical Drive.reg (100%)
rename {Misc => .root_items/Misc}/Nirsoft Utilities - Outlook.url (100%)
rename {Misc => .root_items/Misc}/Nirsoft Utilities - Passwords.url (100%)
rename {Misc => .root_items/Misc}/Sysinternals Suite (Live).url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/AV Removal Tools.url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/AVG.url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/Avast.url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/Avira.url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/ESET.url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/Kaspersky.url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/MBAM.url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/McAfee.url (100%)
rename {Uninstallers => .root_items/Uninstallers}/AV Removal Tools/Norton.url (100%)
delete mode 100644 Activate Windows.cmd
create mode 100644 Build Kit.cmd
delete mode 100644 Data Recovery/PhotoRec (CLI).cmd
delete mode 100644 Data Recovery/PhotoRec.cmd
delete mode 100644 Data Recovery/TestDisk.cmd
delete mode 100644 Data Transfers/FastCopy (as ADMIN).cmd
delete mode 100644 Data Transfers/FastCopy.cmd
delete mode 100644 Data Transfers/KVRT.cmd
delete mode 100644 Data Transfers/Transferred Keys.cmd
delete mode 100644 Data Transfers/User Data Transfer.cmd
delete mode 100644 Data Transfers/XYplorer (as ADMIN).cmd
delete mode 100644 Data Transfers/XYplorer.cmd
delete mode 100644 Diagnostics/Extras/AIDA64.cmd
delete mode 100644 Diagnostics/Extras/Autoruns (with VirusTotal Scan).cmd
delete mode 100644 Diagnostics/Extras/BleachBit.cmd
delete mode 100644 Diagnostics/Extras/BlueScreenView.cmd
delete mode 100644 Diagnostics/Extras/ERUNT.cmd
delete mode 100644 Diagnostics/Extras/HWiNFO (Sensors).cmd
delete mode 100644 Diagnostics/Extras/HitmanPro.cmd
delete mode 100644 Diagnostics/HWiNFO.cmd
delete mode 100644 Diagnostics/ProduKey.cmd
delete mode 100644 Drivers/Extras/Acer.cmd
delete mode 100644 Drivers/Extras/Lenovo.cmd
delete mode 100644 Drivers/Extras/Toshiba.cmd
delete mode 100644 Drivers/Intel RST (Current Release).cmd
delete mode 100644 Drivers/Intel RST (Previous Releases).cmd
delete mode 100644 Drivers/Intel SSD Toolbox.cmd
delete mode 100644 Drivers/Samsing Magician.cmd
delete mode 100644 Drivers/Snappy Driver Installer.cmd
delete mode 100644 Enter SafeMode.cmd
delete mode 100644 Exit SafeMode.cmd
delete mode 100644 Installers/Extras/Office/2013/Home and Business 2013 (x32).cmd
delete mode 100644 Installers/Extras/Office/2013/Home and Business 2013 (x64).cmd
delete mode 100644 Installers/Extras/Office/2013/Home and Student 2013 (x32).cmd
delete mode 100644 Installers/Extras/Office/2013/Home and Student 2013 (x64).cmd
delete mode 100644 Installers/Extras/Office/2016/Home and Business 2016 (x32).cmd
delete mode 100644 Installers/Extras/Office/2016/Home and Business 2016 (x64).cmd
delete mode 100644 Installers/Extras/Office/2016/Home and Student 2016 (x32).cmd
delete mode 100644 Installers/Extras/Office/2016/Home and Student 2016 (x64).cmd
delete mode 100644 Installers/Extras/Office/2016/Office 365 2016 (x32).cmd
delete mode 100644 Installers/Extras/Office/2016/Office 365 2016 (x64).cmd
delete mode 100644 Installers/Extras/QuickBooks/2015/QuickBooksPremier2015.cmd
delete mode 100644 Installers/Extras/QuickBooks/2015/QuickBooksPro2015.cmd
delete mode 100644 Installers/Extras/QuickBooks/2016/QuickBooksPremier2016.cmd
delete mode 100644 Installers/Extras/QuickBooks/2016/QuickBooksPro2016.cmd
delete mode 100644 Installers/Extras/QuickBooks/2017/QuickBooksPremier2017.cmd
delete mode 100644 Installers/Extras/QuickBooks/2017/QuickBooksPro2017.cmd
delete mode 100644 Installers/SW Bundle.cmd
delete mode 100644 Misc/ConEmu (as ADMIN).cmd
delete mode 100644 Misc/ConEmu.cmd
delete mode 100644 Misc/Everything.cmd
delete mode 100644 Misc/Notepad++.cmd
delete mode 100644 Misc/TreeSizeFree.cmd
delete mode 100644 Misc/XMPlay.cmd
delete mode 100644 Repairs/AdwCleaner.cmd
delete mode 100644 Repairs/Autoruns.cmd
delete mode 100644 Repairs/CHKDSK.cmd
delete mode 100644 Repairs/DISM.cmd
delete mode 100644 Repairs/KVRT.cmd
delete mode 100644 Repairs/RKill.cmd
delete mode 100644 Repairs/SFC Scan.cmd
delete mode 100644 Repairs/TDSSKiller.cmd
delete mode 100644 System Checklist.cmd
delete mode 100644 System Diagnostics.cmd
delete mode 100644 Uninstallers/IObit Uninstaller.cmd
delete mode 100644 User Checklist.cmd
diff --git a/.bin/ConEmu/ConEmu.xml b/.bin/ConEmu/ConEmu.xml
new file mode 100644
index 00000000..e1f2d5e8
--- /dev/null
+++ b/.bin/ConEmu/ConEmu.xml
@@ -0,0 +1,787 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Copy WizardKit.cmd b/.bin/Scripts/Copy WizardKit.cmd
similarity index 100%
rename from Copy WizardKit.cmd
rename to .bin/Scripts/Copy WizardKit.cmd
diff --git a/.bin/Scripts/Launcher_Template.cmd b/.bin/Scripts/Launcher_Template.cmd
index 552382db..488f5800 100644
--- a/.bin/Scripts/Launcher_Template.cmd
+++ b/.bin/Scripts/Launcher_Template.cmd
@@ -12,6 +12,10 @@ call :CheckFlags %*
call :FindBin
call :SetTitle Launcher
+:Optional
+:: This section is for any work that needs done before launching L_ITEM
+rem EXTRA_CODE_GOES_HERE
+
:DefineLaunch
:: Set L_TYPE to one of these options:
:: Console, Folder, Office, Program, PSScript, or PyScript
@@ -30,12 +34,12 @@ call :SetTitle Launcher
:: Set L_ELEV to True to launch with elevated permissions
:: Set L_NCMD to True to stay in the native console window
:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=__TYPE__
-set L_PATH=__PATH__
-set L_ITEM=__ITEM__
+set L_TYPE=
+set L_PATH=
+set L_ITEM=
set L_ARGS=
set L_7ZIP=
-set L_CHCK=True
+set L_CHCK=
set L_ELEV=
set L_NCMD=
set L_WAIT=
diff --git a/.bin/Scripts/_Update Kit.cmd b/.bin/Scripts/_Update Kit.cmd
deleted file mode 100644
index 5d7e71d5..00000000
--- a/.bin/Scripts/_Update Kit.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=update_kit.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/.bin/Scripts/build_kit.ps1 b/.bin/Scripts/build_kit.ps1
new file mode 100644
index 00000000..6338cc99
--- /dev/null
+++ b/.bin/Scripts/build_kit.ps1
@@ -0,0 +1,170 @@
+# Wizard Kit: Download kit components
+
+## Init ##
+clear
+$host.UI.RawUI.WindowTitle = "Wizard Kit: Build Tool"
+$wd = $(Split-Path $MyInvocation.MyCommand.Path)
+$bin = (Get-Item $wd).Parent.FullName
+$tmp = "{0}\tmp" -f $bin
+$errors = 0
+pushd "$wd"
+$host.UI.RawUI.BackgroundColor = "black"
+$host.UI.RawUI.ForegroundColor = "white"
+$progressPreference = 'silentlyContinue'
+
+## Functions ##
+function download-file {
+ param ([String]$path, [String]$name, [String]$url)
+ $outfile = "{0}\{1}" -f $path, $name
+
+ Write-Host ("Downloading: {0}" -f $name)
+ New-Item -Type Directory $path 2>&1 | Out-Null
+ try {
+ invoke-webrequest -uri $url -outfile $outfile
+ }
+ catch {
+ Write-Host (" ERROR: Failed to download file." ) -foregroundcolor "Red"
+ $errors += 1
+ }
+}
+function find-dynamic-url {
+ param ([String]$source_page, [String]$regex)
+ $d_url = ""
+
+ # Get source page
+ invoke-webrequest -uri $source_page -outfile "tmp_page"
+
+ # Search for real url
+ $d_url = Get-Content "tmp_page" | Where-Object {$_ -imatch $regex}
+ $d_url = $d_url -ireplace '.*(a |)href="([^"]+)".*', '$2'
+ $d_url = $d_url -ireplace ".*(a |)href='([^']+)'.*", '$2'
+
+ # Remove tmp_page
+ Remove-Item "tmp_page"
+
+ return $d_url
+}
+function wk_pause {
+ param([string]$message = "Press Enter to continue... ")
+ Write-Host $message
+ $x = read-host
+}
+
+## Download ##
+$path = $tmp
+
+# 7-Zip
+$url = "http://www.7-zip.org/a/7z1701.msi"
+download-file $path "7z-installer.msi" $url
+$url = "http://www.7-zip.org/a/7z1701-extra.7z"
+download-file $path "7z-extra.7z" $url
+
+# ConEmu
+$url = "https://github.com/Maximus5/ConEmu/releases/download/v17.11.09/ConEmuPack.171109.7z"
+download-file $path "ConEmuPack.7z" $url
+
+# Notepad++
+$url = "https://notepad-plus-plus.org/repository/7.x/7.5.1/npp.7.5.1.bin.minimalist.7z"
+download-file $path "npp.7z" $url
+
+# Python
+$url = "https://www.python.org/ftp/python/3.6.3/python-3.6.3-embed-win32.zip"
+download-file $path "python32.zip" $url
+$url = "https://www.python.org/ftp/python/3.6.3/python-3.6.3-embed-amd64.zip"
+download-file $path "python64.zip" $url
+
+# Python: psutil
+$dl_page = "https://pypi.python.org/pypi/psutil"
+$regex = "href=.*-cp36-cp36m-win32.whl"
+$url = find-dynamic-url $dl_page $regex
+download-file $path "psutil32.whl" $url
+$regex = "href=.*-cp36-cp36m-win_amd64.whl"
+$url = find-dynamic-url $dl_page $regex
+download-file $path "psutil64.whl" $url
+
+# Python: requests & dependancies
+$regex = "href=.*.py3-none-any.whl"
+foreach ($mod in @("chardet", "certifi", "idna", "urllib3", "requests")) {
+ $dl_page = "https://pypi.python.org/pypi/{0}" -f $mod
+ $name = "{0}.whl" -f $mod
+ $url = find-dynamic-url $dl_page $regex
+ download-file $path $name $url
+}
+
+## Extract ##
+# 7-Zip
+Write-Host "Extracting: 7-Zip"
+try {
+ start "msiexec" -argumentlist @("/a", "$tmp\7z-installer.msi", "TARGETDIR=$tmp\7zi", "/qn") -wait
+ $sz = "$tmp\7zi\Files\7-Zip\7z.exe"
+ start $sz -argumentlist @("x", "$tmp\7z-extra.7z", "-o$bin\7-Zip", "-aoa", "-bso0", "-bse0", "-bsp0", "-x!x64\*.dll", "-x!Far", "-x!*.dll") -nonewwindow -wait
+ Start-Sleep 1
+ Move-Item "$bin\7-Zip\x64\7za.exe" "$bin\7-Zip\7za64.exe"
+ Remove-Item "$bin\7-Zip\x64" -Recurse
+ Remove-Item "$tmp\7z*" -Recurse
+ $sz = "$bin\7-Zip\7za.exe"
+}
+catch {
+ Write-Host (" ERROR: Failed to extract files." ) -foregroundcolor "Red"
+}
+
+# Notepad++
+Write-Host "Extracting: Notepad++"
+try {
+ start $sz -argumentlist @("x", "$tmp\npp.7z", "-o$bin\NotepadPlusPlus", "-aoa", "-bso0", "-bse0", "-bsp0") -nonewwindow -wait
+ Remove-Item "$tmp\npp.7z"
+ Move-Item "$bin\NotepadPlusPlus\notepad++.exe" "$bin\NotepadPlusPlus\notepadplusplus.exe"
+}
+catch {
+ Write-Host (" ERROR: Failed to extract files." ) -foregroundcolor "Red"
+}
+
+# ConEmu
+Write-Host "Extracting: ConEmu"
+try {
+ start $sz -argumentlist @("x", "$tmp\ConEmuPack.7z", "-o$bin\ConEmu", "-aoa", "-bso0", "-bse0", "-bsp0") -nonewwindow -wait
+ Remove-Item "$tmp\ConEmuPack.7z"
+}
+catch {
+ Write-Host (" ERROR: Failed to extract files." ) -foregroundcolor "Red"
+}
+
+# Python x32
+Write-Host "Extracting: Python (x32)"
+try {
+ foreach ($file in @("python32.zip", "certifi.whl", "chardet.whl", "idna.whl", "psutil32.whl", "requests.whl", "urllib3.whl")) {
+ start $sz -argumentlist @("x", "$tmp\$file", "-o$bin\Python\x32", "-aoa", "-bso0", "-bse0", "-bsp0") -nonewwindow -wait
+ }
+}
+catch {
+ Write-Host (" ERROR: Failed to extract files." ) -foregroundcolor "Red"
+}
+
+# Python x64
+Write-Host "Extracting: Python (x64)"
+try {
+ foreach ($file in @("python64.zip", "certifi.whl", "chardet.whl", "idna.whl", "psutil64.whl", "requests.whl", "urllib3.whl")) {
+ start $sz -argumentlist @("x", "$tmp\$file", "-o$bin\Python\x64", "-aoa", "-bso0", "-bse0", "-bsp0") -nonewwindow -wait
+ }
+ Remove-Item "$tmp\python*.zip"
+ Remove-Item "$tmp\*.whl"
+}
+catch {
+ Write-Host (" ERROR: Failed to extract files." ) -foregroundcolor "Red"
+}
+
+## Cleanup ##
+Move-Item "$bin\..\Build Kit.cmd" "$bin\Scripts\Build Kit.cmd"
+
+## Configure ##
+Write-Host "Configuring kit"
+wk_pause "Press Enter to open settings..."
+start "$bin\NotepadPlusPlus\notepadplusplus.exe" -argumentlist @("$bin\Scripts\settings\main.py") -wait
+
+## Done ##
+popd
+if ($errors -gt 0) {
+ wk_pause "Press Enter to exit..."
+} else {
+ start "$bin\ConEmu\ConEmu.exe" -argumentlist @("-run", "$bin\Python\x32\python.exe", "$bin\Scripts\update_kit.py")
+}
diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py
new file mode 100644
index 00000000..3adca3a1
--- /dev/null
+++ b/.bin/Scripts/settings/launchers.py
@@ -0,0 +1,857 @@
+# Wizard Kit: Settings - Launchers
+
+LAUNCHERS = {
+ '/': {
+ 'Activate Windows': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'activate.py',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ },
+ 'Enter SafeMode': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'safemode_enter.py',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ },
+ 'Exit SafeMode': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'safemode_exit.py',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ },
+ 'System Checklist': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'system_checklist.py',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ },
+ 'System Diagnostics': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'system_diagnostics.py',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ },
+ 'User Checklist': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'user_checklist.py',
+ 'L_CHCK': 'True',
+ 'L_NCMD': '',
+ },
+ },
+ '/Data Recovery': {
+ 'PhotoRec (CLI)': {
+ 'L_TYPE': 'Console',
+ 'L_PATH': 'TestDisk',
+ 'L_ITEM': 'photorec_win.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'PhotoRec': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'TestDisk',
+ 'L_ITEM': 'qphotorec_win.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'TestDisk': {
+ 'L_TYPE': 'Console',
+ 'L_PATH': 'TestDisk',
+ 'L_ITEM': 'testdisk_win.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ },
+ '/Data Transfers': {
+ 'FastCopy (as ADMIN)': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'FastCopy',
+ 'L_ITEM': 'FastCopy.exe',
+ 'L_ARGS': (
+ r' /logfile=%log_dir%\FastCopy.log'
+ r' /cmd=noexist_only'
+ r' /utf8'
+ r' /skip_empty_dir'
+ r' /linkdest'
+ r' /exclude='
+ r'$RECYCLE.BIN;'
+ r'$Recycle.Bin;'
+ r'.AppleDB;'
+ r'.AppleDesktop;'
+ r'.AppleDouble;'
+ r'.com.apple.timemachine.supported;'
+ r'.dbfseventsd;'
+ r'.DocumentRevisions-V100*;'
+ r'.DS_Store;'
+ r'.fseventsd;'
+ r'.PKInstallSandboxManager;'
+ r'.Spotlight*;'
+ r'.SymAV*;'
+ r'.symSchedScanLockxz;'
+ r'.TemporaryItems;'
+ r'.Trash*;'
+ r'.vol;'
+ r'.VolumeIcon.icns;'
+ r'desktop.ini;'
+ r'Desktop?DB;'
+ r'Desktop?DF;'
+ r'hiberfil.sys;'
+ r'lost+found;'
+ r'Network?Trash?Folder;'
+ r'pagefile.sys;'
+ r'Recycled;'
+ r'RECYCLER;'
+ r'System?Volume?Information;'
+ r'Temporary?Items;'
+ r'Thumbs.db'
+ r' /to=%client_dir%\Transfer_%iso_date%\ '
+ ),
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'call "%bin%\Scripts\init_client_dir.cmd" /Info /Transfer',
+ ],
+ },
+ 'FastCopy': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'FastCopy',
+ 'L_ITEM': 'FastCopy.exe',
+ 'L_ARGS': (
+ r' /logfile=%log_dir%\FastCopy.log'
+ r' /cmd=noexist_only'
+ r' /utf8'
+ r' /skip_empty_dir'
+ r' /linkdest'
+ r' /exclude='
+ r'$RECYCLE.BIN;'
+ r'$Recycle.Bin;'
+ r'.AppleDB;'
+ r'.AppleDesktop;'
+ r'.AppleDouble;'
+ r'.com.apple.timemachine.supported;'
+ r'.dbfseventsd;'
+ r'.DocumentRevisions-V100*;'
+ r'.DS_Store;'
+ r'.fseventsd;'
+ r'.PKInstallSandboxManager;'
+ r'.Spotlight*;'
+ r'.SymAV*;'
+ r'.symSchedScanLockxz;'
+ r'.TemporaryItems;'
+ r'.Trash*;'
+ r'.vol;'
+ r'.VolumeIcon.icns;'
+ r'desktop.ini;'
+ r'Desktop?DB;'
+ r'Desktop?DF;'
+ r'hiberfil.sys;'
+ r'lost+found;'
+ r'Network?Trash?Folder;'
+ r'pagefile.sys;'
+ r'Recycled;'
+ r'RECYCLER;'
+ r'System?Volume?Information;'
+ r'Temporary?Items;'
+ r'Thumbs.db'
+ r' /to=%client_dir%\Transfer_%iso_date%\ '
+ ),
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'call "%bin%\Scripts\init_client_dir.cmd" /Info /Transfer',
+ ],
+ },
+ 'KVRT': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'KVRT',
+ 'L_ITEM': 'KVRT.exe',
+ 'L_ARGS': (
+ r' -accepteula'
+ r' -d %q_dir%'
+ r' -processlevel 3'
+ r' -dontcryptsupportinfo'
+ r' -fixednames'
+ ),
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
+ r'set "q_dir=%client_dir%\Quarantine\KVRT"',
+ r'mkdir "%q_dir%">nul 2>&1',
+ ],
+ },
+ 'Transferred Keys': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'transferred_keys.py',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'User Data Transfer': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'user_data_transfer.py',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'XYplorer (as ADMIN)': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'XYplorerFree',
+ 'L_ITEM': 'XYplorerFree.exe',
+ 'L_ARGS': r'/exp /win=max %userprofile%',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'XYplorer': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'XYplorerFree',
+ 'L_ITEM': 'XYplorerFree.exe',
+ 'L_ARGS': r'/exp /win=max %userprofile%',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ },
+ '/Diagnostics': {
+ 'HWiNFO': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'HWiNFO',
+ 'L_ITEM': 'HWiNFO.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'for %%a in (32 64) do (',
+ r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r')',
+ ],
+ },
+ 'ProduKey': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'ProduKey',
+ 'L_ITEM': 'ProduKey.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'if exist "%bin%\ProduKey" (',
+ r' del "%bin%\ProduKey\ProduKey.cfg" 2>nul',
+ r' del "%bin%\ProduKey\ProduKey64.cfg" 2>nul',
+ r')',
+ ],
+ },
+ },
+ '/Diagnostics/Extras': {
+ 'AIDA64': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'AIDA64',
+ 'L_ITEM': 'aida64.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Autoruns (with VirusTotal Scan)': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'Autoruns',
+ 'L_ITEM': 'Autoruns.exe',
+ 'L_ARGS': '-e',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownomicrosoft /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownowindows /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v showonlyvirustotal /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v submitvirustotal /t REG_DWORD /d 0 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v verifysignatures /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns\SigCheck /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul',
+ ],
+ },
+ 'BleachBit': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'BleachBit',
+ 'L_ITEM': 'bleachbit.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'BlueScreenView': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'BlueScreenView',
+ 'L_ITEM': 'BlueScreenView.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'ERUNT': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'erunt',
+ 'L_ITEM': 'ERUNT.EXE',
+ 'L_ARGS': '%log_dir%\Registry sysreg curuser otherusers',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'call "%bin%\Scripts\init_client_dir.cmd" /Info',
+ ],
+ },
+ 'HitmanPro': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': '',
+ 'L_ITEM': '',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'call "%bin%\Scripts\init_client_dir.cmd" /Info',
+ ],
+ },
+ 'HWiNFO (Sensors)': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'HWiNFO',
+ 'L_ITEM': 'HWiNFO.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'for %%a in (32 64) do (',
+ r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SensorsOnly=1)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r')',
+ ],
+ },
+ },
+ '/Drivers': {
+ 'Intel RST (Current Release)': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': '_Drivers\Intel RST',
+ 'L_ITEM': 'SetupRST_15.8.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': 'SetupRST_15.8.exe',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Intel RST (Previous Releases)': {
+ 'L_TYPE': 'Folder',
+ 'L_PATH': '_Drivers\Intel RST',
+ 'L_ITEM': '.',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Intel SSD Toolbox': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': '_Drivers',
+ 'L_ITEM': 'Intel SSD Toolbox.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Samsing Magician': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': '_Drivers',
+ 'L_ITEM': 'Samsung Magician.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Snappy Driver Installer': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': '_Drivers\SDI',
+ 'L_ITEM': 'SDI.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ },
+ '/Drivers/Extras': {
+ 'Acer': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'HWiNFO',
+ 'L_ITEM': 'HWiNFO.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'for %%a in (32 64) do (',
+ r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r')',
+ r'start "" "http://us.acer.com/ac/en/US/content/drivers"',
+ ],
+ },
+ 'Lenovo': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'HWiNFO',
+ 'L_ITEM': 'HWiNFO.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'for %%a in (32 64) do (',
+ r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r')',
+ r'start "" "http://support.lenovo.com/us/en/products?tabName=Downloads"',
+ ],
+ },
+ 'Toshiba': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'HWiNFO',
+ 'L_ITEM': 'HWiNFO.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'for %%a in (32 64) do (',
+ r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r' (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+ r')',
+ r'start "" "http://support.toshiba.com/drivers"',
+ ],
+ },
+ },
+ '/Installers': {
+ 'SW Bundle': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'install_sw_bundle.py',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ },
+ '/Installers/Extras/Office/2013': {
+ 'Home and Business 2013 (x32)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2013',
+ 'L_ITEM': 'hb_32.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'Home and Business 2013 (x64)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2013',
+ 'L_ITEM': 'hb_64.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'Home and Student 2013 (x32)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2013',
+ 'L_ITEM': 'hs_32.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'Home and Student 2013 (x64)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2013',
+ 'L_ITEM': 'hs_64.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ },
+ '/Installers/Extras/Office/2016': {
+ 'Home and Business 2016 (x32)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2016',
+ 'L_ITEM': 'hb_32.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'Home and Business 2016 (x64)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2016',
+ 'L_ITEM': 'hb_64.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'Home and Student 2016 (x32)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2016',
+ 'L_ITEM': 'hs_32.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'Home and Student 2016 (x64)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2016',
+ 'L_ITEM': 'hs_64.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'Office 365 2016 (x32)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2016',
+ 'L_ITEM': '365_32.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'Office 365 2016 (x64)': {
+ 'L_TYPE': 'Office',
+ 'L_PATH': '2016',
+ 'L_ITEM': '365_64.xml',
+ 'L_ARGS': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ },
+ '/Misc': {
+ 'ConEmu (as ADMIN)': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'ConEmu',
+ 'L_ITEM': 'ConEmu.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'ConEmu': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'ConEmu',
+ 'L_ITEM': 'ConEmu.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Everything': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'Everything',
+ 'L_ITEM': 'Everything.exe',
+ 'L_ARGS': '-nodb',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Notepad++': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'notepadplusplus',
+ 'L_ITEM': 'notepadplusplus.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'TreeSizeFree': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'TreeSizeFree',
+ 'L_ITEM': 'TreeSizeFree.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Update Kit': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'update_kit.py',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'XMPlay': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'XMPlay',
+ 'L_ITEM': 'xmplay.exe',
+ 'L_ARGS': '"%bin%\XMPlay\music.7z"',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ },
+ '/Repairs': {
+ 'AdwCleaner': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'AdwCleaner',
+ 'L_ITEM': 'AdwCleaner.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'Autoruns': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'Autoruns',
+ 'L_ITEM': 'Autoruns.exe',
+ 'L_ARGS': '-e',
+ 'L_7ZIP': 'Autoruns*',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 0 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownomicrosoft /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownowindows /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v showonlyvirustotal /t REG_DWORD /d 0 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v submitvirustotal /t REG_DWORD /d 0 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns /v verifysignatures /t REG_DWORD /d 0 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns\SigCheck /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+ r'reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul',
+ ],
+ },
+ 'CHKDSK': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'check_disk.py',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': '',
+ 'L_WAIT': '',
+ },
+ 'DISM': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'dism.py',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'TRUE',
+ 'L_WAIT': '',
+ },
+ 'KVRT': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'KVRT',
+ 'L_ITEM': 'KVRT.exe',
+ 'L_ARGS': (
+ r' -accepteula'
+ r' -d %q_dir%'
+ r' -processlevel 3'
+ r' -dontcryptsupportinfo'
+ r' -fixednames'
+ ),
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
+ r'set "q_dir=%client_dir%\Quarantine\KVRT"',
+ r'mkdir "%q_dir%">nul 2>&1',
+ ],
+ },
+ 'RKill': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'RKill',
+ 'L_ITEM': 'RKill.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'call "%bin%\Scripts\init_client_dir.cmd" /Info',
+ ],
+ },
+ 'SFC Scan': {
+ 'L_TYPE': 'PyScript',
+ 'L_PATH': 'Scripts',
+ 'L_ITEM': 'sfc_scan.py',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': 'True',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ 'TDSSKiller': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'TDSSKiller',
+ 'L_ITEM': 'TDSSKiller.exe',
+ 'L_ARGS': (
+ r' -l %log_dir%\TDSSKiller.log'
+ r' -qpath %q_dir%'
+ r' -accepteula'
+ r' -accepteulaksn'
+ r' -dcexact'
+ r' -tdlfs'
+ ),
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ 'Extra Code': [
+ r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
+ r'set "q_dir=%client_dir%\Quarantine\TDSSKiller"',
+ r'mkdir "%q_dir%">nul 2>&1',
+ ],
+ },
+ },
+ '/Uninstallers': {
+ 'IObit Uninstaller': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'IObitUninstallerPortable',
+ 'L_ITEM': 'IObitUninstallerPortable.exe',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
+ },
+ },
+
+if __name__ == '__main__':
+ print("This file is not meant to be called directly.")
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index ea2da6db..96807cfd 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -11,6 +11,9 @@ init_global_vars()
os.system('title {}: Kit Update Tool'.format(KIT_NAME_FULL))
if __name__ == '__main__':
+ print('Loaded update_kit.py!')
+ pause('Hmm...')
+ exit_script()
try:
other_results = {
'Error': {
diff --git a/.gitignore b/.gitignore
index d425d033..bf961f6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,17 @@
**/__pycache__/*
-.bin/tmp
-.bin/ConEmu/
-.bin/python/
-.bin/7-Zip/
-.bin/NotepadPlusPlus/
-.cbin/
*.exe
-.bin/HWiNFO/HWiNFO*.ini
-.bin/ProcessKiller/
-.bin/SysinternalsSuite/
-.bin/XMPlay/
+.bin/7-Zip/
.bin/AIDA64/
.bin/BleachBit/
-.bin/erunt/
-.bin/Everything/
-.bin/ProduKey/
.bin/ClassicStartSkin/
-.bin/curl/
+.bin/ConEmu/
+.bin/Erunt/
+.bin/Everything/
+.bin/HWiNFO/HWiNFO*.ini
+.bin/NotepadPlusPlus/
+.bin/ProcessKiller/
+.bin/ProduKey/
+.bin/Python/
+.bin/Tmp/
+.bin/XMPlay/
+.cbin/
diff --git a/Drivers/Extras/AMD.url b/.root_items/Drivers/Extras/AMD.url
similarity index 100%
rename from Drivers/Extras/AMD.url
rename to .root_items/Drivers/Extras/AMD.url
diff --git a/Drivers/Extras/Dell (FTP - Browse for Drivers).url b/.root_items/Drivers/Extras/Dell (FTP - Browse for Drivers).url
similarity index 100%
rename from Drivers/Extras/Dell (FTP - Browse for Drivers).url
rename to .root_items/Drivers/Extras/Dell (FTP - Browse for Drivers).url
diff --git a/Drivers/Extras/Dell (Simplified Interface).url b/.root_items/Drivers/Extras/Dell (Simplified Interface).url
similarity index 100%
rename from Drivers/Extras/Dell (Simplified Interface).url
rename to .root_items/Drivers/Extras/Dell (Simplified Interface).url
diff --git a/Drivers/Extras/Dell (Support Site).url b/.root_items/Drivers/Extras/Dell (Support Site).url
similarity index 100%
rename from Drivers/Extras/Dell (Support Site).url
rename to .root_items/Drivers/Extras/Dell (Support Site).url
diff --git a/Drivers/Extras/Device Remover.url b/.root_items/Drivers/Extras/Device Remover.url
similarity index 100%
rename from Drivers/Extras/Device Remover.url
rename to .root_items/Drivers/Extras/Device Remover.url
diff --git a/Drivers/Extras/Display Driver Uninstaller.url b/.root_items/Drivers/Extras/Display Driver Uninstaller.url
similarity index 100%
rename from Drivers/Extras/Display Driver Uninstaller.url
rename to .root_items/Drivers/Extras/Display Driver Uninstaller.url
diff --git a/Drivers/Extras/HP.url b/.root_items/Drivers/Extras/HP.url
similarity index 100%
rename from Drivers/Extras/HP.url
rename to .root_items/Drivers/Extras/HP.url
diff --git a/Drivers/Extras/Intel Driver & Support Assistant.url b/.root_items/Drivers/Extras/Intel Driver & Support Assistant.url
similarity index 100%
rename from Drivers/Extras/Intel Driver & Support Assistant.url
rename to .root_items/Drivers/Extras/Intel Driver & Support Assistant.url
diff --git a/Drivers/Extras/NVIDIA.url b/.root_items/Drivers/Extras/NVIDIA.url
similarity index 100%
rename from Drivers/Extras/NVIDIA.url
rename to .root_items/Drivers/Extras/NVIDIA.url
diff --git a/Drivers/Extras/Samsung Tools & Software.url b/.root_items/Drivers/Extras/Samsung Tools & Software.url
similarity index 100%
rename from Drivers/Extras/Samsung Tools & Software.url
rename to .root_items/Drivers/Extras/Samsung Tools & Software.url
diff --git a/Installers/BackBlaze.url b/.root_items/Installers/BackBlaze.url
similarity index 100%
rename from Installers/BackBlaze.url
rename to .root_items/Installers/BackBlaze.url
diff --git a/Misc/Fix Missing Optical Drive.reg b/.root_items/Misc/Fix Missing Optical Drive.reg
similarity index 100%
rename from Misc/Fix Missing Optical Drive.reg
rename to .root_items/Misc/Fix Missing Optical Drive.reg
diff --git a/Misc/Nirsoft Utilities - Outlook.url b/.root_items/Misc/Nirsoft Utilities - Outlook.url
similarity index 100%
rename from Misc/Nirsoft Utilities - Outlook.url
rename to .root_items/Misc/Nirsoft Utilities - Outlook.url
diff --git a/Misc/Nirsoft Utilities - Passwords.url b/.root_items/Misc/Nirsoft Utilities - Passwords.url
similarity index 100%
rename from Misc/Nirsoft Utilities - Passwords.url
rename to .root_items/Misc/Nirsoft Utilities - Passwords.url
diff --git a/Misc/Sysinternals Suite (Live).url b/.root_items/Misc/Sysinternals Suite (Live).url
similarity index 100%
rename from Misc/Sysinternals Suite (Live).url
rename to .root_items/Misc/Sysinternals Suite (Live).url
diff --git a/Uninstallers/AV Removal Tools/AV Removal Tools.url b/.root_items/Uninstallers/AV Removal Tools/AV Removal Tools.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/AV Removal Tools.url
rename to .root_items/Uninstallers/AV Removal Tools/AV Removal Tools.url
diff --git a/Uninstallers/AV Removal Tools/AVG.url b/.root_items/Uninstallers/AV Removal Tools/AVG.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/AVG.url
rename to .root_items/Uninstallers/AV Removal Tools/AVG.url
diff --git a/Uninstallers/AV Removal Tools/Avast.url b/.root_items/Uninstallers/AV Removal Tools/Avast.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/Avast.url
rename to .root_items/Uninstallers/AV Removal Tools/Avast.url
diff --git a/Uninstallers/AV Removal Tools/Avira.url b/.root_items/Uninstallers/AV Removal Tools/Avira.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/Avira.url
rename to .root_items/Uninstallers/AV Removal Tools/Avira.url
diff --git a/Uninstallers/AV Removal Tools/ESET.url b/.root_items/Uninstallers/AV Removal Tools/ESET.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/ESET.url
rename to .root_items/Uninstallers/AV Removal Tools/ESET.url
diff --git a/Uninstallers/AV Removal Tools/Kaspersky.url b/.root_items/Uninstallers/AV Removal Tools/Kaspersky.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/Kaspersky.url
rename to .root_items/Uninstallers/AV Removal Tools/Kaspersky.url
diff --git a/Uninstallers/AV Removal Tools/MBAM.url b/.root_items/Uninstallers/AV Removal Tools/MBAM.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/MBAM.url
rename to .root_items/Uninstallers/AV Removal Tools/MBAM.url
diff --git a/Uninstallers/AV Removal Tools/McAfee.url b/.root_items/Uninstallers/AV Removal Tools/McAfee.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/McAfee.url
rename to .root_items/Uninstallers/AV Removal Tools/McAfee.url
diff --git a/Uninstallers/AV Removal Tools/Norton.url b/.root_items/Uninstallers/AV Removal Tools/Norton.url
similarity index 100%
rename from Uninstallers/AV Removal Tools/Norton.url
rename to .root_items/Uninstallers/AV Removal Tools/Norton.url
diff --git a/Activate Windows.cmd b/Activate Windows.cmd
deleted file mode 100644
index 615d5f93..00000000
--- a/Activate Windows.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=activate.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Build Kit.cmd b/Build Kit.cmd
new file mode 100644
index 00000000..4a81d71b
--- /dev/null
+++ b/Build Kit.cmd
@@ -0,0 +1,53 @@
+:: Wizard Kit: Build Tool Launcher ::
+
+@echo off
+
+:Init
+setlocal
+call :CheckFlags %*
+title Wizard Kit: Build Tool
+
+:LaunchPrep
+rem Verifies the environment before launching item
+if not exist ".bin\Scripts\build_kit.ps1" (goto ErrorBuildKitMissing)
+
+:Launch
+rem Calls the Launch.cmd script using the variables defined above
+powershell -executionpolicy bypass -noprofile -file .bin\Scripts\build_kit.ps1 || goto ErrorUnknown
+goto Exit
+
+:: Functions ::
+:CheckFlags
+rem Loops through all arguments to check for accepted flags
+set DEBUG=
+for %%f in (%*) do (
+ if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
+)
+@exit /b 0
+
+:: Errors ::
+:ErrorBuildKitMissing
+echo.
+echo ERROR: build_kit.ps1 script not found.
+goto Abort
+
+:ErrorUnknown
+echo.
+echo ERROR: Encountered an unknown error.
+goto Abort
+
+:Abort
+color 4e
+echo Aborted.
+echo.
+echo Press any key to exit...
+pause>nul
+color
+rem Set errorlevel to 1 by calling color incorrectly
+color 00
+goto Exit
+
+:: Cleanup and exit ::
+:Exit
+endlocal
+exit /b %errorlevel%
diff --git a/Data Recovery/PhotoRec (CLI).cmd b/Data Recovery/PhotoRec (CLI).cmd
deleted file mode 100644
index 4d1eb5bb..00000000
--- a/Data Recovery/PhotoRec (CLI).cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Console
-set L_PATH=TestDisk
-set L_ITEM=photorec_win.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Data Recovery/PhotoRec.cmd b/Data Recovery/PhotoRec.cmd
deleted file mode 100644
index d489acd9..00000000
--- a/Data Recovery/PhotoRec.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Console
-set L_PATH=TestDisk
-set L_ITEM=qphotorec_win.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Data Recovery/TestDisk.cmd b/Data Recovery/TestDisk.cmd
deleted file mode 100644
index b29aba6e..00000000
--- a/Data Recovery/TestDisk.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Console
-set L_PATH=TestDisk
-set L_ITEM=testdisk_win.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Data Transfers/FastCopy (as ADMIN).cmd b/Data Transfers/FastCopy (as ADMIN).cmd
deleted file mode 100644
index 9de4f7e4..00000000
--- a/Data Transfers/FastCopy (as ADMIN).cmd
+++ /dev/null
@@ -1,127 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-call "%bin%\Scripts\init_client_dir.cmd" /Info /Transfer
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=FastCopy
-set L_ITEM=FastCopy.exe
-set L_ARGS=/logfile=%log_dir%\FastCopy.log /cmd=noexist_only /utf8 /skip_empty_dir /linkdest /exclude=$RECYCLE.BIN;$Recycle.Bin;.AppleDB;.AppleDesktop;.AppleDouble;.com.apple.timemachine.supported;.dbfseventsd;.DocumentRevisions-V100*;.DS_Store;.fseventsd;.PKInstallSandboxManager;.Spotlight*;.SymAV*;.symSchedScanLockxz;.TemporaryItems;.Trash*;.vol;.VolumeIcon.icns;desktop.ini;Desktop?DB;Desktop?DF;hiberfil.sys;lost+found;Network?Trash?Folder;pagefile.sys;Recycled;RECYCLER;System?Volume?Information;Temporary?Items;Thumbs.db /to=%client_dir%\Transfer_%iso_date%\
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/Data Transfers/FastCopy.cmd b/Data Transfers/FastCopy.cmd
deleted file mode 100644
index eae3688c..00000000
--- a/Data Transfers/FastCopy.cmd
+++ /dev/null
@@ -1,127 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-call "%bin%\Scripts\init_client_dir.cmd" /Info /Transfer
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=FastCopy
-set L_ITEM=FastCopy.exe
-set L_ARGS=/logfile=%log_dir%\FastCopy.log /cmd=noexist_only /utf8 /skip_empty_dir /linkdest /exclude=$RECYCLE.BIN;$Recycle.Bin;.AppleDB;.AppleDesktop;.AppleDouble;.com.apple.timemachine.supported;.dbfseventsd;.DocumentRevisions-V100*;.DS_Store;.fseventsd;.PKInstallSandboxManager;.Spotlight*;.SymAV*;.symSchedScanLockxz;.TemporaryItems;.Trash*;.vol;.VolumeIcon.icns;desktop.ini;Desktop?DB;Desktop?DF;hiberfil.sys;lost+found;Network?Trash?Folder;pagefile.sys;Recycled;RECYCLER;System?Volume?Information;Temporary?Items;Thumbs.db /to=%client_dir%\Transfer_%iso_date%\
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/Data Transfers/KVRT.cmd b/Data Transfers/KVRT.cmd
deleted file mode 100644
index 2ad0f695..00000000
--- a/Data Transfers/KVRT.cmd
+++ /dev/null
@@ -1,129 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-call "%bin%\Scripts\init_client_dir.cmd" /Quarantine
-set "q_dir=%client_dir%\Quarantine\KVRT"
-mkdir "%q_dir%">nul 2>&1
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=KVRT
-set L_ITEM=KVRT.exe
-set L_ARGS=-accepteula -d %q_dir% -processlevel 3 -dontcryptsupportinfo -fixednames
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Data Transfers/Transferred Keys.cmd b/Data Transfers/Transferred Keys.cmd
deleted file mode 100644
index be1f1369..00000000
--- a/Data Transfers/Transferred Keys.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=transferred_keys.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Data Transfers/User Data Transfer.cmd b/Data Transfers/User Data Transfer.cmd
deleted file mode 100644
index 0820a153..00000000
--- a/Data Transfers/User Data Transfer.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=user_data_transfer.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Data Transfers/XYplorer (as ADMIN).cmd b/Data Transfers/XYplorer (as ADMIN).cmd
deleted file mode 100644
index 2af99043..00000000
--- a/Data Transfers/XYplorer (as ADMIN).cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=XYplorerFree
-set L_ITEM=XYplorerFree.exe
-set L_ARGS=/exp /win=max %userprofile%
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Data Transfers/XYplorer.cmd b/Data Transfers/XYplorer.cmd
deleted file mode 100644
index e4371c6c..00000000
--- a/Data Transfers/XYplorer.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=XYplorerFree
-set L_ITEM=XYplorerFree.exe
-set L_ARGS=/exp /win=max %userprofile%
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/Extras/AIDA64.cmd b/Diagnostics/Extras/AIDA64.cmd
deleted file mode 100644
index 8f834b62..00000000
--- a/Diagnostics/Extras/AIDA64.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=AIDA64
-set L_ITEM=aida64.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/Extras/Autoruns (with VirusTotal Scan).cmd b/Diagnostics/Extras/Autoruns (with VirusTotal Scan).cmd
deleted file mode 100644
index f355c653..00000000
--- a/Diagnostics/Extras/Autoruns (with VirusTotal Scan).cmd
+++ /dev/null
@@ -1,138 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:Configure
-reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v shownomicrosoft /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v shownowindows /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v showonlyvirustotal /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v submitvirustotal /t REG_DWORD /d 0 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v verifysignatures /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns\SigCheck /v EulaAccepted /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=Autoruns
-set L_ITEM=Autoruns.exe
-set L_ARGS=-e
-set L_7ZIP=Autoruns*
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/Extras/BleachBit.cmd b/Diagnostics/Extras/BleachBit.cmd
deleted file mode 100644
index 582e34c8..00000000
--- a/Diagnostics/Extras/BleachBit.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=BleachBit
-set L_ITEM=bleachbit.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/Extras/BlueScreenView.cmd b/Diagnostics/Extras/BlueScreenView.cmd
deleted file mode 100644
index 928705c1..00000000
--- a/Diagnostics/Extras/BlueScreenView.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=BlueScreenView
-set L_ITEM=BlueScreenView.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/Extras/ERUNT.cmd b/Diagnostics/Extras/ERUNT.cmd
deleted file mode 100644
index 5ca53226..00000000
--- a/Diagnostics/Extras/ERUNT.cmd
+++ /dev/null
@@ -1,127 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-call "%bin%\Scripts\init_client_dir.cmd" /Info
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=erunt
-set L_ITEM=ERUNT.EXE
-set L_ARGS=%log_dir%\Registry sysreg curuser otherusers
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/Extras/HWiNFO (Sensors).cmd b/Diagnostics/Extras/HWiNFO (Sensors).cmd
deleted file mode 100644
index b8038dee..00000000
--- a/Diagnostics/Extras/HWiNFO (Sensors).cmd
+++ /dev/null
@@ -1,134 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:Configure
-rem just configure for both x32 & x64
-for %%a in (32 64) do (
- copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SensorsOnly=1)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
-)
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=HWiNFO
-set L_ITEM=HWiNFO.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/Extras/HitmanPro.cmd b/Diagnostics/Extras/HitmanPro.cmd
deleted file mode 100644
index ec6344af..00000000
--- a/Diagnostics/Extras/HitmanPro.cmd
+++ /dev/null
@@ -1,127 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-call "%bin%\Scripts\init_client_dir.cmd" /Info
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=HitmanPro
-set L_ITEM=HitmanPro.exe
-set L_ARGS=/scan /noinstall /noupload /log=%log_dir%\hitman.xml
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/HWiNFO.cmd b/Diagnostics/HWiNFO.cmd
deleted file mode 100644
index 564f2895..00000000
--- a/Diagnostics/HWiNFO.cmd
+++ /dev/null
@@ -1,134 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:Configure
-rem just configure for both x32 & x64
-for %%a in (32 64) do (
- copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
-)
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=HWiNFO
-set L_ITEM=HWiNFO.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Diagnostics/ProduKey.cmd b/Diagnostics/ProduKey.cmd
deleted file mode 100644
index d4e8b544..00000000
--- a/Diagnostics/ProduKey.cmd
+++ /dev/null
@@ -1,132 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:ClearConfigs
-if exist "%bin%\ProduKey" (
- del "%bin%\ProduKey\ProduKey.cfg" 2>nul
- del "%bin%\ProduKey\ProduKey64.cfg" 2>nul
-)
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=ProduKey
-set L_ITEM=ProduKey.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Drivers/Extras/Acer.cmd b/Drivers/Extras/Acer.cmd
deleted file mode 100644
index 89addc25..00000000
--- a/Drivers/Extras/Acer.cmd
+++ /dev/null
@@ -1,137 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:Configure
-rem just configure for both x32 & x64
-for %%a in (32 64) do (
- copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
-)
-
-:OpenDriverPage
-start "" "http://us.acer.com/ac/en/US/content/drivers"
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=HWiNFO
-set L_ITEM=HWiNFO.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Drivers/Extras/Lenovo.cmd b/Drivers/Extras/Lenovo.cmd
deleted file mode 100644
index f072ae41..00000000
--- a/Drivers/Extras/Lenovo.cmd
+++ /dev/null
@@ -1,137 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:Configure
-rem just configure for both x32 & x64
-for %%a in (32 64) do (
- copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
-)
-
-:OpenDriverPage
-start "" "http://support.lenovo.com/us/en/products?tabName=Downloads"
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=HWiNFO
-set L_ITEM=HWiNFO.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Drivers/Extras/Toshiba.cmd b/Drivers/Extras/Toshiba.cmd
deleted file mode 100644
index 28116d3b..00000000
--- a/Drivers/Extras/Toshiba.cmd
+++ /dev/null
@@ -1,137 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:Configure
-rem just configure for both x32 & x64
-for %%a in (32 64) do (
- copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
- (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"
-)
-
-:OpenDriverPage
-start "" "http://support.toshiba.com/drivers"
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=HWiNFO
-set L_ITEM=HWiNFO.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Drivers/Intel RST (Current Release).cmd b/Drivers/Intel RST (Current Release).cmd
deleted file mode 100644
index 8f5f09c4..00000000
--- a/Drivers/Intel RST (Current Release).cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=_Drivers\Intel RST
-set L_ITEM=SetupRST_15.8.exe
-set L_ARGS=
-set L_7ZIP=SetupRST_15.8.exe
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Drivers/Intel RST (Previous Releases).cmd b/Drivers/Intel RST (Previous Releases).cmd
deleted file mode 100644
index 8c6a994b..00000000
--- a/Drivers/Intel RST (Previous Releases).cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Folder
-set L_PATH=_Drivers\Intel RST
-set L_ITEM=.
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Drivers/Intel SSD Toolbox.cmd b/Drivers/Intel SSD Toolbox.cmd
deleted file mode 100644
index c830d5e0..00000000
--- a/Drivers/Intel SSD Toolbox.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=_Drivers
-set L_ITEM=Intel SSD Toolbox.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Drivers/Samsing Magician.cmd b/Drivers/Samsing Magician.cmd
deleted file mode 100644
index 84b003ef..00000000
--- a/Drivers/Samsing Magician.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=_Drivers
-set L_ITEM=Samsung Magician.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Drivers/Snappy Driver Installer.cmd b/Drivers/Snappy Driver Installer.cmd
deleted file mode 100644
index fdbf842a..00000000
--- a/Drivers/Snappy Driver Installer.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=_Drivers\SDI
-set L_ITEM=SDI.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Enter SafeMode.cmd b/Enter SafeMode.cmd
deleted file mode 100644
index 64dc125e..00000000
--- a/Enter SafeMode.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=safemode_enter.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Exit SafeMode.cmd b/Exit SafeMode.cmd
deleted file mode 100644
index 19ac904c..00000000
--- a/Exit SafeMode.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=safemode_exit.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2013/Home and Business 2013 (x32).cmd b/Installers/Extras/Office/2013/Home and Business 2013 (x32).cmd
deleted file mode 100644
index f80f5afd..00000000
--- a/Installers/Extras/Office/2013/Home and Business 2013 (x32).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2013
-set L_ITEM=hb_32.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2013/Home and Business 2013 (x64).cmd b/Installers/Extras/Office/2013/Home and Business 2013 (x64).cmd
deleted file mode 100644
index a622b8b1..00000000
--- a/Installers/Extras/Office/2013/Home and Business 2013 (x64).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2013
-set L_ITEM=hb_64.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2013/Home and Student 2013 (x32).cmd b/Installers/Extras/Office/2013/Home and Student 2013 (x32).cmd
deleted file mode 100644
index d6da84d5..00000000
--- a/Installers/Extras/Office/2013/Home and Student 2013 (x32).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2013
-set L_ITEM=hs_32.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2013/Home and Student 2013 (x64).cmd b/Installers/Extras/Office/2013/Home and Student 2013 (x64).cmd
deleted file mode 100644
index 4f946af2..00000000
--- a/Installers/Extras/Office/2013/Home and Student 2013 (x64).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2013
-set L_ITEM=hs_64.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2016/Home and Business 2016 (x32).cmd b/Installers/Extras/Office/2016/Home and Business 2016 (x32).cmd
deleted file mode 100644
index 41ae7ed8..00000000
--- a/Installers/Extras/Office/2016/Home and Business 2016 (x32).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2016
-set L_ITEM=hb_32.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2016/Home and Business 2016 (x64).cmd b/Installers/Extras/Office/2016/Home and Business 2016 (x64).cmd
deleted file mode 100644
index 0b091dfb..00000000
--- a/Installers/Extras/Office/2016/Home and Business 2016 (x64).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2016
-set L_ITEM=hb_64.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2016/Home and Student 2016 (x32).cmd b/Installers/Extras/Office/2016/Home and Student 2016 (x32).cmd
deleted file mode 100644
index 95c5218b..00000000
--- a/Installers/Extras/Office/2016/Home and Student 2016 (x32).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2016
-set L_ITEM=hs_32.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2016/Home and Student 2016 (x64).cmd b/Installers/Extras/Office/2016/Home and Student 2016 (x64).cmd
deleted file mode 100644
index bebd1ef8..00000000
--- a/Installers/Extras/Office/2016/Home and Student 2016 (x64).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2016
-set L_ITEM=hs_64.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2016/Office 365 2016 (x32).cmd b/Installers/Extras/Office/2016/Office 365 2016 (x32).cmd
deleted file mode 100644
index 8cb85d76..00000000
--- a/Installers/Extras/Office/2016/Office 365 2016 (x32).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2016
-set L_ITEM=365_32.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/Office/2016/Office 365 2016 (x64).cmd b/Installers/Extras/Office/2016/Office 365 2016 (x64).cmd
deleted file mode 100644
index 6dd35122..00000000
--- a/Installers/Extras/Office/2016/Office 365 2016 (x64).cmd
+++ /dev/null
@@ -1,125 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Office
-set L_PATH=2016
-set L_ITEM=365_64.xml
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Installers/Extras/QuickBooks/2015/QuickBooksPremier2015.cmd b/Installers/Extras/QuickBooks/2015/QuickBooksPremier2015.cmd
deleted file mode 100644
index b09a8f0d..00000000
--- a/Installers/Extras/QuickBooks/2015/QuickBooksPremier2015.cmd
+++ /dev/null
@@ -1,124 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=QuickBooks
-set L_PATH=2015
-set L_ITEM=QuickBooksPremier2015
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "KIT_NAME_FULL=%%f"
-)
-set "KIT_NAME_FULL=%KIT_NAME_FULL:~15,-1%"
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/Installers/Extras/QuickBooks/2015/QuickBooksPro2015.cmd b/Installers/Extras/QuickBooks/2015/QuickBooksPro2015.cmd
deleted file mode 100644
index 15b14db0..00000000
--- a/Installers/Extras/QuickBooks/2015/QuickBooksPro2015.cmd
+++ /dev/null
@@ -1,124 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=QuickBooks
-set L_PATH=2015
-set L_ITEM=QuickBooksPro2015
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "KIT_NAME_FULL=%%f"
-)
-set "KIT_NAME_FULL=%KIT_NAME_FULL:~15,-1%"
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/Installers/Extras/QuickBooks/2016/QuickBooksPremier2016.cmd b/Installers/Extras/QuickBooks/2016/QuickBooksPremier2016.cmd
deleted file mode 100644
index d80839c1..00000000
--- a/Installers/Extras/QuickBooks/2016/QuickBooksPremier2016.cmd
+++ /dev/null
@@ -1,124 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=QuickBooks
-set L_PATH=2016
-set L_ITEM=QuickBooksPremier2016
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "KIT_NAME_FULL=%%f"
-)
-set "KIT_NAME_FULL=%KIT_NAME_FULL:~15,-1%"
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/Installers/Extras/QuickBooks/2016/QuickBooksPro2016.cmd b/Installers/Extras/QuickBooks/2016/QuickBooksPro2016.cmd
deleted file mode 100644
index 71010aa0..00000000
--- a/Installers/Extras/QuickBooks/2016/QuickBooksPro2016.cmd
+++ /dev/null
@@ -1,124 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=QuickBooks
-set L_PATH=2016
-set L_ITEM=QuickBooksPro2016
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "KIT_NAME_FULL=%%f"
-)
-set "KIT_NAME_FULL=%KIT_NAME_FULL:~15,-1%"
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/Installers/Extras/QuickBooks/2017/QuickBooksPremier2017.cmd b/Installers/Extras/QuickBooks/2017/QuickBooksPremier2017.cmd
deleted file mode 100644
index 371629f6..00000000
--- a/Installers/Extras/QuickBooks/2017/QuickBooksPremier2017.cmd
+++ /dev/null
@@ -1,124 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=QuickBooks
-set L_PATH=2017
-set L_ITEM=QuickBooksPremier2017
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "KIT_NAME_FULL=%%f"
-)
-set "KIT_NAME_FULL=%KIT_NAME_FULL:~15,-1%"
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/Installers/Extras/QuickBooks/2017/QuickBooksPro2017.cmd b/Installers/Extras/QuickBooks/2017/QuickBooksPro2017.cmd
deleted file mode 100644
index 632d9fb9..00000000
--- a/Installers/Extras/QuickBooks/2017/QuickBooksPro2017.cmd
+++ /dev/null
@@ -1,124 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console
-:: Office
-:: Program
-:: PSScript
-:: PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %bin%\L_PATH
-:: 2: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to the filename of the item to launch (or Office product to install)
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=QuickBooks
-set L_PATH=2017
-set L_ITEM=QuickBooksPro2017
-set L_ARGS=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "KIT_NAME_FULL=%%f"
-)
-set "KIT_NAME_FULL=%KIT_NAME_FULL:~15,-1%"
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
diff --git a/Installers/SW Bundle.cmd b/Installers/SW Bundle.cmd
deleted file mode 100644
index c9168179..00000000
--- a/Installers/SW Bundle.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=install_sw_bundle.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Misc/ConEmu (as ADMIN).cmd b/Misc/ConEmu (as ADMIN).cmd
deleted file mode 100644
index 2499d61b..00000000
--- a/Misc/ConEmu (as ADMIN).cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=ConEmu
-set L_ITEM=ConEmu.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Misc/ConEmu.cmd b/Misc/ConEmu.cmd
deleted file mode 100644
index 3526cffa..00000000
--- a/Misc/ConEmu.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=ConEmu
-set L_ITEM=ConEmu.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Misc/Everything.cmd b/Misc/Everything.cmd
deleted file mode 100644
index ec340519..00000000
--- a/Misc/Everything.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=Everything
-set L_ITEM=Everything.exe
-set L_ARGS=-nodb
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Misc/Notepad++.cmd b/Misc/Notepad++.cmd
deleted file mode 100644
index 85026824..00000000
--- a/Misc/Notepad++.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=notepadplusplus
-set L_ITEM=notepadplusplus.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Misc/TreeSizeFree.cmd b/Misc/TreeSizeFree.cmd
deleted file mode 100644
index eece55aa..00000000
--- a/Misc/TreeSizeFree.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=TreeSizeFree
-set L_ITEM=TreeSizeFree.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Misc/XMPlay.cmd b/Misc/XMPlay.cmd
deleted file mode 100644
index 468b8d04..00000000
--- a/Misc/XMPlay.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=XMPlay
-set L_ITEM=xmplay.exe
-set L_ARGS="%bin%\XMPlay\music.7z"
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Repairs/AdwCleaner.cmd b/Repairs/AdwCleaner.cmd
deleted file mode 100644
index 5efa7114..00000000
--- a/Repairs/AdwCleaner.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=AdwCleaner
-set L_ITEM=AdwCleaner.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Repairs/Autoruns.cmd b/Repairs/Autoruns.cmd
deleted file mode 100644
index 7df953ac..00000000
--- a/Repairs/Autoruns.cmd
+++ /dev/null
@@ -1,138 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:Configure
-reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 0 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v shownomicrosoft /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v shownowindows /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v showonlyvirustotal /t REG_DWORD /d 0 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v submitvirustotal /t REG_DWORD /d 0 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns /v verifysignatures /t REG_DWORD /d 0 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns\SigCheck /v EulaAccepted /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD /d 1 /f >nul
-reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=Autoruns
-set L_ITEM=Autoruns.exe
-set L_ARGS=-e
-set L_7ZIP=Autoruns*
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Repairs/CHKDSK.cmd b/Repairs/CHKDSK.cmd
deleted file mode 100644
index cb4404de..00000000
--- a/Repairs/CHKDSK.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=check_disk.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Repairs/DISM.cmd b/Repairs/DISM.cmd
deleted file mode 100644
index e15bba1b..00000000
--- a/Repairs/DISM.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=dism.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=TRUE
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Repairs/KVRT.cmd b/Repairs/KVRT.cmd
deleted file mode 100644
index 2ad0f695..00000000
--- a/Repairs/KVRT.cmd
+++ /dev/null
@@ -1,129 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-call "%bin%\Scripts\init_client_dir.cmd" /Quarantine
-set "q_dir=%client_dir%\Quarantine\KVRT"
-mkdir "%q_dir%">nul 2>&1
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=KVRT
-set L_ITEM=KVRT.exe
-set L_ARGS=-accepteula -d %q_dir% -processlevel 3 -dontcryptsupportinfo -fixednames
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Repairs/RKill.cmd b/Repairs/RKill.cmd
deleted file mode 100644
index 44da0cd3..00000000
--- a/Repairs/RKill.cmd
+++ /dev/null
@@ -1,131 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-call "%bin%\Scripts\init_client_dir.cmd" /Info
-
-:UglyHackToOpenRKillFolder
-rem "Sleeps" in the background for 10 secs and then opens the RKill folder
-start "" /b cmd /c ping -n 10 127.0.0.1^>nul ^& if exist "%bin%\RKill" explorer "%bin%\RKill"
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=RKill
-set L_ITEM=RKill.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Repairs/SFC Scan.cmd b/Repairs/SFC Scan.cmd
deleted file mode 100644
index 282e11b7..00000000
--- a/Repairs/SFC Scan.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=sfc_scan.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Repairs/TDSSKiller.cmd b/Repairs/TDSSKiller.cmd
deleted file mode 100644
index 588cf17f..00000000
--- a/Repairs/TDSSKiller.cmd
+++ /dev/null
@@ -1,129 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-call "%bin%\Scripts\init_client_dir.cmd" /Quarantine
-set "q_dir=%client_dir%\Quarantine\TDSSKiller"
-mkdir "%q_dir%">nul 2>&1
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=TDSSKiller
-set L_ITEM=TDSSKiller.exe
-set L_ARGS=-l %log_dir%\TDSSKiller.log -qpath %q_dir% -accepteula -accepteulaksn -dcexact -tdlfs
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/System Checklist.cmd b/System Checklist.cmd
deleted file mode 100644
index 03c398cd..00000000
--- a/System Checklist.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=system_checklist.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/System Diagnostics.cmd b/System Diagnostics.cmd
deleted file mode 100644
index 56a25389..00000000
--- a/System Diagnostics.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=system_diagnostics.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=True
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/Uninstallers/IObit Uninstaller.cmd b/Uninstallers/IObit Uninstaller.cmd
deleted file mode 100644
index c418fd32..00000000
--- a/Uninstallers/IObit Uninstaller.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=Program
-set L_PATH=IObitUninstaller
-set L_ITEM=IObitUninstaler.exe
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
diff --git a/User Checklist.cmd b/User Checklist.cmd
deleted file mode 100644
index 6d8ae60b..00000000
--- a/User Checklist.cmd
+++ /dev/null
@@ -1,126 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=user_checklist.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=True
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
From e4bcf7f037928012d8d864e02808a86d8d5d3e90 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Sat, 18 Nov 2017 22:57:33 -0800
Subject: [PATCH 02/20] Updated README
---
README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 55d05673..09c533dd 100644
--- a/README.md
+++ b/README.md
@@ -24,5 +24,7 @@ A collection of scripts to help technicians service Windows systems.
## Setup ##
-* Edit the `.bin\Scripts\settings\main.py` file to your liking.
-* _**(Broken)**_ Run the `_Update Kit.cmd` file to populate `.bin` and `.cbin`.
\ No newline at end of file
+* Run `Build Kit.cmd` which will do the following:
+ * Download 7-Zip, ConEmu, Notepad++, and Python (including wheel packages)
+ * Open `.bin\Scripts\settings\main.py` in Notepad++ for configuration
+ * Update the rest of the tools with the `.bin\Scripts\update_kit.py` script
\ No newline at end of file
From 59ecefe83970e2861b0ade8647f034fb7517afbd Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Sun, 19 Nov 2017 02:51:33 -0800
Subject: [PATCH 03/20] Added initial cbin downloads
* Need to add rest of the tools and compression sections
---
.bin/Scripts/build_kit.ps1 | 13 +-
.bin/Scripts/functions/build.py | 157 ------
.bin/Scripts/functions/update.py | 509 ++++++++++++++++++
.bin/Scripts/update_kit.py | 218 ++------
{.bin => .cbin/_include}/AIDA64/full.rpf | 0
.../_include}/AIDA64/installed_programs.rpf | 0
{.bin => .cbin/_include}/AIDA64/licenses.rpf | 0
.../_include}/NotepadPlusPlus/config.xml | 0
.../_include}/XYplorerFree/Data/XYplorer.ini | Bin
.gitignore | 6 +-
UPDATEME.cmd | 130 +++++
11 files changed, 707 insertions(+), 326 deletions(-)
delete mode 100644 .bin/Scripts/functions/build.py
create mode 100644 .bin/Scripts/functions/update.py
rename {.bin => .cbin/_include}/AIDA64/full.rpf (100%)
rename {.bin => .cbin/_include}/AIDA64/installed_programs.rpf (100%)
rename {.bin => .cbin/_include}/AIDA64/licenses.rpf (100%)
rename {.bin => .cbin/_include}/NotepadPlusPlus/config.xml (100%)
rename {.bin => .cbin/_include}/XYplorerFree/Data/XYplorer.ini (100%)
create mode 100644 UPDATEME.cmd
diff --git a/.bin/Scripts/build_kit.ps1 b/.bin/Scripts/build_kit.ps1
index 6338cc99..2d54a413 100644
--- a/.bin/Scripts/build_kit.ps1
+++ b/.bin/Scripts/build_kit.ps1
@@ -5,6 +5,8 @@ clear
$host.UI.RawUI.WindowTitle = "Wizard Kit: Build Tool"
$wd = $(Split-Path $MyInvocation.MyCommand.Path)
$bin = (Get-Item $wd).Parent.FullName
+$root = (Get-Item "$bin\..").FullName # Get-Item $bin fails
+ # (I'm assuming that starting with a '.' is the issue)
$tmp = "{0}\tmp" -f $bin
$errors = 0
pushd "$wd"
@@ -154,12 +156,21 @@ catch {
}
## Cleanup ##
-Move-Item "$bin\..\Build Kit.cmd" "$bin\Scripts\Build Kit.cmd"
+Move-Item "$root\Build Kit.cmd" "$bin\Scripts\Build Kit.cmd"
+Move-Item "$root\.root_items\*" "$root\"
+New-Item "$root\.cbin"
+Remove-Item "$root\.root_items"
+foreach ($item in @(".bin", ".cbin")) {
+ if (Test-Path "$root\$item") {
+ (Get-Item "$root\$item").attributes = "Hidden"
+ }
+}
## Configure ##
Write-Host "Configuring kit"
wk_pause "Press Enter to open settings..."
start "$bin\NotepadPlusPlus\notepadplusplus.exe" -argumentlist @("$bin\Scripts\settings\main.py") -wait
+Start-Sleep 1
## Done ##
popd
diff --git a/.bin/Scripts/functions/build.py b/.bin/Scripts/functions/build.py
deleted file mode 100644
index ae7009c2..00000000
--- a/.bin/Scripts/functions/build.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# Wizard Kit: Functions - Build / Update
-
-from functions.common import *
-
-def download_file(out_dir, out_name, source_url):
- """Downloads a file using curl."""
- extract_item('curl', silent=True)
- _cmd = [
- global_vars['Tools']['curl'],
- # '-#LSfo', # ProgressBar
- '-Lfso',
- '{}/{}'.format(out_dir, out_name),
- source_url]
- os.makedirs(out_dir, exist_ok=True)
- run_program(_cmd, pipe=False)
-
-def resolve_dynamic_url(source_url, regex):
- """Scan source_url for a url using the regex provided; returns str."""
- # Download the "download page"
- extract_item('curl', silent=True)
- _tmp_file = r'{TmpDir}\webpage.tmp'.format(**global_vars)
- _cmd = [
- global_vars['Tools']['curl'],
- '-#LSfo',
- _tmp_file,
- source_url]
- try:
- run_program(_cmd)
- except Exception:
- # "Fail silently as the download_file() function will catch it
- return None
-
- # Scan the file for the regex
- with open(_tmp_file, 'r') as file:
- for line in file:
- if re.search(regex, line):
- _url = line.strip()
- _url = re.sub(r'.*(a |)href="([^"]+)".*', r'\2', _url)
- _url = re.sub(r".*(a |)href='([^']+)'.*", r'\2', _url)
- break
-
- # Cleanup and return
- os.remove(_tmp_file)
- return _url
-
-def update_adwcleaner():
- _path = global_vars['BinDir']
- _name = 'AdwCleaner.exe'
- _dl_page = 'http://www.bleepingcomputer.com/download/adwcleaner/dl/125/'
- _regex = r'href=.*http(s|)://download\.bleepingcomputer\.com/dl/[a-zA-Z0-9]+/[a-zA-Z0-9]+/windows/security/security-utilities/a/adwcleaner/AdwCleaner\.exe'
- _url = resolve_dynamic_url(_dl_page, _regex)
- download_file(_path, _name, _url)
-
-def update_eset():
- _path = global_vars['BinDir']
- _name = 'ESET.exe'
- _url = 'http://download.eset.com/special/eos/esetsmartinstaller_enu.exe'
- download_file(_path, _name, _url)
-
-def update_jrt():
- _path = global_vars['BinDir']
- _name = 'JRT.exe'
- _url = 'http://downloads.malwarebytes.org/file/jrt'
- download_file(_path, _name, _url)
-
-def update_kvrt():
- _path = global_vars['BinDir']
- _name = 'KVRT.exe'
- _url = 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe'
- download_file(_path, _name, _url)
-
-def update_hitmanpro():
- _path = '{BinDir}/HitmanPro'.format(**global_vars)
- _name = 'HitmanPro.exe'
- _url = 'http://dl.surfright.nl/HitmanPro.exe'
- download_file(_path, _name, _url)
-
- _name = 'HitmanPro64.exe'
- _url = 'http://dl.surfright.nl/HitmanPro_x64.exe'
- download_file(_path, _name, _url)
-
-def update_intel_driver_utility():
- _path = '{BinDir}/_Drivers'.format(**global_vars)
- _name = 'Intel Driver Update Utility.exe'
- _dl_page = 'http://www.intel.com/content/www/us/en/support/detect.html'
- _regex = r'a href.*http(s|)://downloadmirror\.intel\.com/[a-zA-Z0-9]+/[a-zA-Z0-9]+/Intel%20Driver%20Update%20Utility%20Installer.exe'
- _url = resolve_dynamic_url(_dl_page, _regex)
- _url = resolve_dynamic_url(_dl_page, _regex)
- download_file(_path, _name, _url)
-
-def update_intel_ssd_toolbox():
- _path = '{BinDir}/_Drivers'.format(**global_vars)
- _name = 'Intel SSD Toolbox.exe'
- _dl_page = 'https://downloadcenter.intel.com/download/26085/Intel-Solid-State-Drive-Toolbox'
- _regex = r'href=./downloads/eula/[0-9]+/Intel-Solid-State-Drive-Toolbox.httpDown=https\%3A\%2F\%2Fdownloadmirror\.intel\.com\%2F[0-9]+\%2Feng\%2FIntel\%20SSD\%20Toolbox\%20-\%20v[0-9\.]+.exe'
- _url = resolve_dynamic_url(_dl_page, _regex)
- _url = re.sub(r'.*httpDown=(.*)', r'\1', _url, re.IGNORECASE)
- _url = _url.replace('%3A', ':')
- _url = _url.replace('%2F', '/')
- download_file(_path, _name, _url)
-
-def update_rkill():
- _path = '{BinDir}/RKill'.format(**global_vars)
- _name = 'RKill.exe'
- _dl_page = 'http://www.bleepingcomputer.com/download/rkill/dl/10/'
- _regex = r'href=.*http(s|)://download\.bleepingcomputer\.com/dl/[a-zA-Z0-9]+/[a-zA-Z0-9]+/windows/security/security-utilities/r/rkill/rkill\.exe'
- _url = resolve_dynamic_url(_dl_page, _regex)
- download_file(_path, _name, _url)
-
-def update_samsung_magician():
- print_warning('Disabled.')
- #~Broken~# _path = '{BinDir}/_Drivers'.format(**global_vars)
- #~Broken~# _name = 'Samsung Magician.zip'
- #~Broken~# _dl_page = 'http://www.samsung.com/semiconductor/minisite/ssd/download/tools.html'
- #~Broken~# _regex = r'href=./semiconductor/minisite/ssd/downloads/software/Samsung_Magician_Setup_v[0-9]+.zip'
- #~Broken~# _url = resolve_dynamic_url(_dl_page, _regex)
- #~Broken~# # Convert relative url to absolute
- #~Broken~# _url = 'http://www.samsung.com' + _url
- #~Broken~# download_file(_path, _name, _url)
- #~Broken~# # Extract and replace old copy
- #~Broken~# _args = [
- #~Broken~# 'e', '"{BinDir}/_Drivers/Samsung Magician.zip"'.format(**global_vars),
- #~Broken~# '-aoa', '-bso0', '-bsp0',
- #~Broken~# '-o"{BinDir}/_Drivers"'.format(**global_vars)
- #~Broken~# ]
- #~Broken~# run_program(seven_zip, _args)
- #~Broken~# try:
- #~Broken~# os.remove('{BinDir}/_Drivers/Samsung Magician.zip'.format(**global_vars))
- #~Broken~# #~PoSH~# Move-Item "$bin\_Drivers\Samsung*exe" "$bin\_Drivers\Samsung Magician.exe" $path 2>&1 | Out-Null
- #~Broken~# except Exception:
- #~Broken~# pass
- pass
-
-def update_sysinternalssuite():
- _path = '{BinDir}/tmp'.format(**global_vars)
- _name = 'SysinternalsSuite.zip'
- _url = 'https://download.sysinternals.com/files/SysinternalsSuite.zip'
- download_file(_path, _name, _url)
- # Extract
- _args = [
- 'e', '"{BinDir}/tmp/SysinternalsSuite.zip"'.format(**global_vars),
- '-aoa', '-bso0', '-bsp0',
- '-o"{BinDir}/SysinternalsSuite"'.format(**global_vars)]
- run_program(seven_zip, _args)
- try:
- os.remove('{BinDir}/tmp/SysinternalsSuite.zip'.format(**global_vars))
- except Exception:
- pass
-
-def update_tdsskiller():
- _path = global_vars['BinDir']
- _name = 'TDSSKiller.exe'
- _url = 'http://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe'
- download_file(_path, _name, _url)
-
-if __name__ == '__main__':
- print("This file is not meant to be called directly.")
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
new file mode 100644
index 00000000..43b1f5db
--- /dev/null
+++ b/.bin/Scripts/functions/update.py
@@ -0,0 +1,509 @@
+# Wizard Kit: Functions - Build / Update
+## NOTE: This file is full of magic strings!
+
+import requests
+
+from functions.common import *
+from settings.launchers import *
+
+def download_to_temp(out_name, source_url):
+ """Downloads a file using requests."""
+ ## Code based on this Q&A: https://stackoverflow.com/q/16694907
+ ### Asked by: https://stackoverflow.com/users/427457/roman-podlinov
+ ### Edited by: https://stackoverflow.com/users/657427/christophe-roussy
+ ### Using answer: https://stackoverflow.com/a/39217788
+ ### Answer from: https://stackoverflow.com/users/4323/john-zwinck
+ out_dir = global_vars['TmpDir']
+ os.makedirs(out_dir, exist_ok=True)
+ out_path = '{}/{}'.format(out_dir, out_name)
+ try:
+ r = requests.get(source_url, stream=True)
+ with open(out_path, 'wb') as f:
+ shutil.copyfileobj(r.raw, f)
+ r.close()
+ except:
+ raise GenericError('Failed to download file.')
+
+def resolve_dynamic_url(source_url, regex, tmp_file='webpage.tmp'):
+ """Scan source_url for a url using the regex provided; returns str."""
+ # Download the "download page"
+ try:
+ download_to_temp('webpage.tmp', source_url)
+ except Exception:
+ # "Fail silently as the download_to_temp() function will catch it
+ return None
+
+ # Scan the file for the regex
+ tmp_file = r'{}\{}'.format(global_vars['TmpDir'], tmp_file)
+ with open(tmp_file, 'r') as file:
+ for line in file:
+ if re.search(regex, line):
+ url = line.strip()
+ url = re.sub(r'.*(a |)href="([^"]+)".*', r'\2', url)
+ url = re.sub(r".*(a |)href='([^']+)'.*", r'\2', url)
+ break
+
+ # Cleanup and return
+ os.remove(tmp_file)
+ return url
+
+def extract_from_temp(source, root, dest, *args):
+ cmd = [
+ global_vars['Tools']['SevenZip'],
+ 'e', r'{}\{}'.format(global_vars['TmpDir'], source),
+ r'-o{}\{}'.format(root, dest),
+ '-aoa', '-bso0', '-bse0',
+ ]
+ cmd.extend(args)
+ run_program(cmd)
+
+def extract_to_bin(source, item, *args):
+ extract_from_temp(source, global_vars['BinDir'], item, *args)
+
+def extract_to_cbin(source, item, *args):
+ dest = r'{}\{}'.format(global_vars['CBinDir'], item)
+ include_path = r'{}\_include\{}'.format(global_vars['CBinDir'], item)
+ if os.path.exists(include_path):
+ shutil.copytree(include_path, dest)
+ extract_from_temp(source, global_vars['CBinDir'], item, *args)
+
+def remove_from_kit(item):
+ bin_path = r'{}\{}'.format(global_vars['BinDir'], item)
+ cbin_path = r'{}\{}'.format(global_vars['CBinDir'], item)
+ shutil.rmtree(bin_path, ignore_errors=True)
+ shutil.rmtree(cbin_path, ignore_errors=True)
+
+def remove_from_temp(item):
+ os.remove(r'{}\{}'.format(global_vars['TmpDir'], item))
+
+## .bin (NOT compressed) ##
+def update_fastcopy():
+ # Stop running processes
+ for process in ['FastCopy.exe', 'FastCopy64.exe']:
+ kill_process(process)
+
+ # Download
+ name = 'FastCopy32.zip'
+ url = 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip'
+ download_to_temp(name, url)
+
+ name = 'FastCopy64.zip'
+ url = 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip'
+ download_to_temp(name, url)
+
+ # Extract
+ extract_to_bin('FastCopy64.zip', 'FastCopy', 'FastCopy.exe')
+ shutil.move(
+ r'{}\FastCopy\FastCopy.exe'.format(global_vars['BinDir']),
+ r'{}\FastCopy\FastCopy64.exe'.format(global_vars['BinDir']))
+ extract_to_bin('FastCopy32.zip', 'FastCopy', r'-x!setup.exe', r'-x!*.dll')
+
+ # Cleanup
+ remove_from_temp('FastCopy32.zip')
+ remove_from_temp('FastCopy64.zip')
+
+def update_hwinfo():
+ # Stop running processes
+ for exe in ['HWiNFO32.exe', 'HWiNFO64.exe']:
+ kill_process(exe)
+
+ # Download
+ name = 'HWiNFO32.zip'
+ url = 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip'
+ download_to_temp(name, url)
+
+ name = 'HWiNFO64.zip'
+ url = 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_to_bin('HWiNFO32.zip', 'HWiNFO')
+ extract_to_bin('HWiNFO64.zip', 'HWiNFO')
+
+ # Cleanup
+ remove_from_temp('HWiNFO32.zip')
+ remove_from_temp('HWiNFO64.zip')
+
+## Data Recovery ##
+def update_testdisk():
+ # Stop running processes
+ for exe in ['fidentify_win.exe', 'photorec_win.exe',
+ 'qphotorec_win.exe', 'testdisk_win.exe']:
+ kill_process(exe)
+
+ # Remove existing folders
+ remove_from_kit('TestDisk')
+
+ # Download
+ name = 'testdisk_wip.zip'
+ url = 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_to_cbin('testdisk_wip.zip', 'TestDisk')
+
+ # Cleanup
+ remove_from_temp('testdisk_wip.zip')
+
+## Data Transfers ##
+def update_xyplorer():
+ # Stop running processes
+ kill_process('XYplorerFree.exe')
+
+ # Remove existing folders
+ remove_from_kit('XYplorerFree')
+
+ # Download
+ name = 'xyplorer_free.zip'
+ url = 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_to_cbin('xyplorer_free.zip', 'XYplorerFree')
+
+ # Cleanup
+ remove_from_temp('xyplorer_free.zip')
+
+## Diagnostics ##
+def update_aida64():
+ # Stop running processes
+ kill_process('notepadplusplus.exe')
+
+ # Remove existing folders
+ remove_from_kit('AIDA64')
+
+ # Download
+ name = 'aida64.zip'
+ url = 'http://download.aida64.com/aida64engineer592.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_to_cbin('aida64.zip', 'AIDA64')
+
+ # Cleanup
+ remove_from_temp('aida64.zip')
+
+def update_autoruns():
+ pass
+
+def update_bleachbit():
+ pass
+
+def update_bluescreenview():
+ pass
+
+def update_du():
+ pass
+
+def update_erunt():
+ pass
+
+def update_hitmanpro():
+ #def download_hitmanpro():
+ # path = '{CBinDir}/HitmanPro'.format(**global_vars)
+ # name = 'HitmanPro.exe'
+ # url = 'http://dl.surfright.nl/HitmanPro.exe'
+ # download_to_temp(path, name, url)
+ #
+ # name = 'HitmanPro64.exe'
+ # url = 'http://dl.surfright.nl/HitmanPro_x64.exe'
+ # download_to_temp(path, name, url)
+ #
+ pass
+
+def update_produkey():
+ # Stop running processes
+ for exe in ['ProduKey.exe', 'ProduKey64.exe']:
+ kill_process(exe)
+
+ # Remove existing folders
+ remove_from_kit('ProduKey')
+
+ # Download
+ name = 'produkey.zip'
+ url = 'http://www.nirsoft.net/utils/produkey.zip'
+ download_to_temp(name, url)
+
+ name = 'produkey64.zip'
+ url = 'http://www.nirsoft.net/utils/produkey-x64.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_to_cbin('produkey64.zip', 'ProduKey', 'ProduKey.exe')
+ shutil.move(
+ r'{}\ProduKey\ProduKey.exe'.format(global_vars['CBinDir']),
+ r'{}\ProduKey\ProduKey64.exe'.format(global_vars['CBinDir']))
+ extract_to_cbin('produkey.zip', 'ProduKey')
+
+ # Cleanup
+ remove_from_temp('produkey.zip')
+ remove_from_temp('produkey64.zip')
+
+## Drivers ##
+def update_intel_rst():
+ pass
+
+def update_intel_ssd_toolbox():
+ #def update_intel_ssd_toolbox():
+ # path = '{BinDir}/_Drivers'.format(**global_vars)
+ # name = 'Intel SSD Toolbox.exe'
+ # _dl_page = 'https://downloadcenter.intel.com/download/26085/Intel-Solid-State-Drive-Toolbox'
+ # _regex = r'href=./downloads/eula/[0-9]+/Intel-Solid-State-Drive-Toolbox.httpDown=https\%3A\%2F\%2Fdownloadmirror\.intel\.com\%2F[0-9]+\%2Feng\%2FIntel\%20SSD\%20Toolbox\%20-\%20v[0-9\.]+.exe'
+ # url = resolve_dynamic_url(_dl_page, _regex)
+ # url = re.sub(r'.*httpDown=(.*)', r'\1', url, re.IGNORECASE)
+ # url = url.replace('%3A', ':')
+ # url = url.replace('%2F', '/')
+ # download_to_temp(path, name, url)
+ pass
+
+def update_samsing_magician():
+ #def update_samsung_magician():
+ # print_warning('Disabled.')
+ # #~Broken~# path = '{BinDir}/_Drivers'.format(**global_vars)
+ # #~Broken~# name = 'Samsung Magician.zip'
+ # #~Broken~# _dl_page = 'http://www.samsung.com/semiconductor/minisite/ssd/download/tools.html'
+ # #~Broken~# _regex = r'href=./semiconductor/minisite/ssd/downloads/software/Samsung_Magician_Setup_v[0-9]+.zip'
+ # #~Broken~# url = resolve_dynamic_url(_dl_page, _regex)
+ # #~Broken~# # Convert relative url to absolute
+ # #~Broken~# url = 'http://www.samsung.com' + url
+ # #~Broken~# download_to_temp(path, name, url)
+ # #~Broken~# # Extract and replace old copy
+ # #~Broken~# _args = [
+ # #~Broken~# 'e', '"{BinDir}/_Drivers/Samsung Magician.zip"'.format(**global_vars),
+ # #~Broken~# '-aoa', '-bso0', '-bsp0',
+ # #~Broken~# '-o"{BinDir}/_Drivers"'.format(**global_vars)
+ # #~Broken~# ]
+ # #~Broken~# run_program(seven_zip, _args)
+ # #~Broken~# try:
+ # #~Broken~# os.remove('{BinDir}/_Drivers/Samsung Magician.zip'.format(**global_vars))
+ # #~Broken~# #~PoSH~# Move-Item "$bin\_Drivers\Samsung*exe" "$bin\_Drivers\Samsung Magician.exe" $path 2>&1 | Out-Null
+ # #~Broken~# except Exception:
+ # #~Broken~# pass
+ # pass
+ pass
+
+def update_sdi():
+ pass
+
+## Installers ##
+def update_adobe_reader():
+ pass
+
+def update_ninite():
+ # Ninite - Bundles
+ # print_info('Installers')
+ # print_success(' '*4 + 'Ninite Bundles')
+ # _path = r'{BaseDir}\Installers\Extras\Bundles'.format(**global_vars)
+ # try_and_print(message='Runtimes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Runtimes.exe', source_url='https://ninite.com/.net4.7-air-java8-silverlight/ninite.exe')
+ # try_and_print(message='Legacy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Legacy.exe', source_url='https://ninite.com/.net4.7-7zip-air-chrome-firefox-java8-silverlight-vlc/ninite.exe')
+ # try_and_print(message='Modern.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Modern.exe', source_url='https://ninite.com/.net4.7-7zip-air-chrome-classicstart-firefox-java8-silverlight-vlc/ninite.exe')
+
+ # # Ninite - Audio-Video
+ # print_success(' '*4 + 'Audio-Video')
+ # _path = r'{BaseDir}\Installers\Extras\Audio-Video'.format(**global_vars)
+ # try_and_print(message='AIMP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='AIMP.exe', source_url='https://ninite.com/aimp/ninite.exe')
+ # try_and_print(message='Audacity.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Audacity.exe', source_url='https://ninite.com/audacity/ninite.exe')
+ # try_and_print(message='CCCP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CCCP.exe', source_url='https://ninite.com/cccp/ninite.exe')
+ # try_and_print(message='Foobar2000.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Foobar2000.exe', source_url='https://ninite.com/foobar/ninite.exe')
+ # try_and_print(message='GOM.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='GOM.exe', source_url='https://ninite.com/gom/ninite.exe')
+ # try_and_print(message='iTunes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='HandBrake.exe', source_url='https://ninite.com/handbrake/ninite.exe')
+ # try_and_print(message='iTunes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='iTunes.exe', source_url='https://ninite.com/itunes/ninite.exe')
+ # try_and_print(message='K-Lite Codecs.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='K-Lite Codecs.exe', source_url='https://ninite.com/klitecodecs/ninite.exe')
+ # try_and_print(message='MediaMonkey.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='MediaMonkey.exe', source_url='https://ninite.com/mediamonkey/ninite.exe')
+ # try_and_print(message='MusicBee.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='MusicBee.exe', source_url='https://ninite.com/musicbee/ninite.exe')
+ # try_and_print(message='Spotify.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Spotify.exe', source_url='https://ninite.com/spotify/ninite.exe')
+ # try_and_print(message='VLC.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='VLC.exe', source_url='https://ninite.com/vlc/ninite.exe')
+ # try_and_print(message='Winamp.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Winamp.exe', source_url='https://ninite.com/winamp/ninite.exe')
+
+ # # Ninite - Cloud Storage
+ # print_success(' '*4 + 'Cloud Storage')
+ # _path = r'{BaseDir}\Installers\Extras\Cloud Storage'.format(**global_vars)
+ # try_and_print(message='Dropbox.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Dropbox.exe', source_url='https://ninite.com/dropbox/ninite.exe')
+ # try_and_print(message='Google Backup & Sync.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Backup & Sync.exe', source_url='https://ninite.com/googlebackupandsync/ninite.exe')
+ # try_and_print(message='Mozy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Mozy.exe', source_url='https://ninite.com/mozy/ninite.exe')
+ # try_and_print(message='OneDrive.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='OneDrive.exe', source_url='https://ninite.com/onedrive/ninite.exe')
+ # try_and_print(message='SugarSync.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SugarSync.exe', source_url='https://ninite.com/sugarsync/ninite.exe')
+
+ # # Ninite - Communication
+ # print_success(' '*4 + 'Communication')
+ # _path = r'{BaseDir}\Installers\Extras\Communication'.format(**global_vars)
+ # try_and_print(message='Pidgin.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Pidgin.exe', source_url='https://ninite.com/pidgin/ninite.exe')
+ # try_and_print(message='Skype.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Skype.exe', source_url='https://ninite.com/skype/ninite.exe')
+ # try_and_print(message='Trillian.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Trillian.exe', source_url='https://ninite.com/trillian/ninite.exe')
+
+ # # Ninite - Compression
+ # print_success(' '*4 + 'Compression')
+ # _path = r'{BaseDir}\Installers\Extras\Compression'.format(**global_vars)
+ # try_and_print(message='7-Zip.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='7-Zip.exe', source_url='https://ninite.com/7zip/ninite.exe')
+ # try_and_print(message='PeaZip.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PeaZip.exe', source_url='https://ninite.com/peazip/ninite.exe')
+ # try_and_print(message='WinRAR.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinRAR.exe', source_url='https://ninite.com/winrar/ninite.exe')
+
+ # # Ninite - Developer
+ # print_success(' '*4 + 'Developer')
+ # _path = r'{BaseDir}\Installers\Extras\Developer'.format(**global_vars)
+ # try_and_print(message='Eclipse.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Eclipse.exe', source_url='https://ninite.com/eclipse/ninite.exe')
+ # try_and_print(message='FileZilla.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='FileZilla.exe', source_url='https://ninite.com/filezilla/ninite.exe')
+ # try_and_print(message='JDK 8.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='JDK 8.exe', source_url='https://ninite.com/jdk8/ninite.exe')
+ # try_and_print(message='JDK 8 (x64).exe', function=download_file, other_results=other_results, out_dir=_path, out_name='JDK 8 (x64).exe', source_url='https://ninite.com/jdkx8/ninite.exe')
+ # try_and_print(message='Notepad++.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Notepad++.exe', source_url='https://ninite.com/notepadplusplus/ninite.exe')
+ # try_and_print(message='PuTTY.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PuTTY.exe', source_url='https://ninite.com/putty/ninite.exe')
+ # try_and_print(message='Python 2.7.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Python 2.exe', source_url='https://ninite.com/python/ninite.exe')
+ # try_and_print(message='Visual Studio Code.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Visual Studio Code.exe', source_url='https://ninite.com/vscode/ninite.exe')
+ # try_and_print(message='WinMerge.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinMerge.exe', source_url='https://ninite.com/winmerge/ninite.exe')
+ # try_and_print(message='WinSCP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinSCP.exe', source_url='https://ninite.com/winscp/ninite.exe')
+
+ # # Ninite - File Sharing
+ # print_success(' '*4 + 'File Sharing')
+ # _path = r'{BaseDir}\Installers\Extras\File Sharing'.format(**global_vars)
+ # try_and_print(message='qBittorrent.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='qBittorrent.exe', source_url='https://ninite.com/qbittorrent/ninite.exe')
+
+ # # Ninite - Image-Photo
+ # print_success(' '*4 + 'Image-Photo')
+ # _path = r'{BaseDir}\Installers\Extras\Image-Photo'.format(**global_vars)
+ # try_and_print(message='Blender.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Blender.exe', source_url='https://ninite.com/blender/ninite.exe')
+ # try_and_print(message='FastStone.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='FastStone.exe', source_url='https://ninite.com/faststone/ninite.exe')
+ # try_and_print(message='GIMP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='GIMP.exe', source_url='https://ninite.com/gimp/ninite.exe')
+ # try_and_print(message='Greenshot.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Greenshot.exe', source_url='https://ninite.com/greenshot/ninite.exe')
+ # try_and_print(message='Inkscape.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Inkscape.exe', source_url='https://ninite.com/inkscape/ninite.exe')
+ # try_and_print(message='IrfanView.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='IrfanView.exe', source_url='https://ninite.com/irfanview/ninite.exe')
+ # try_and_print(message='Krita.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Krita.exe', source_url='https://ninite.com/krita/ninite.exe')
+ # try_and_print(message='Paint.NET.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Paint.NET.exe', source_url='https://ninite.com/paint.net/ninite.exe')
+ # try_and_print(message='ShareX.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='ShareX.exe', source_url='https://ninite.com/sharex/ninite.exe')
+ # try_and_print(message='XnView.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='XnView.exe', source_url='https://ninite.com/xnview/ninite.exe')
+
+ # # Ninite - Misc
+ # print_success(' '*4 + 'Misc')
+ # _path = r'{BaseDir}\Installers\Extras\Misc'.format(**global_vars)
+ # try_and_print(message='Evernote.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Evernote.exe', source_url='https://ninite.com/evernote/ninite.exe')
+ # try_and_print(message='Everything.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Everything.exe', source_url='https://ninite.com/everything/ninite.exe')
+ # try_and_print(message='KeePass 2.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='KeePass 2.exe', source_url='https://ninite.com/keepass2/ninite.exe')
+ # try_and_print(message='Google Earth.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Earth.exe', source_url='https://ninite.com/googleearth/ninite.exe')
+ # try_and_print(message='NV Access.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='NV Access.exe', source_url='https://ninite.com/nvda/ninite.exe')
+ # try_and_print(message='Steam.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Steam.exe', source_url='https://ninite.com/steam/ninite.exe')
+
+ # # Ninite - Office
+ # print_success(' '*4 + 'Office')
+ # _path = r'{BaseDir}\Installers\Extras\Office'.format(**global_vars)
+ # try_and_print(message='CutePDF.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CutePDF.exe', source_url='https://ninite.com/cutepdf/ninite.exe')
+ # try_and_print(message='Foxit Reader.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Foxit Reader.exe', source_url='https://ninite.com/foxit/ninite.exe')
+ # try_and_print(message='LibreOffice.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='LibreOffice.exe', source_url='https://ninite.com/libreoffice/ninite.exe')
+ # try_and_print(message='OpenOffice.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='OpenOffice.exe', source_url='https://ninite.com/openoffice/ninite.exe')
+ # try_and_print(message='PDFCreator.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PDFCreator.exe', source_url='https://ninite.com/pdfcreator/ninite.exe')
+ # try_and_print(message='SumatraPDF.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SumatraPDF.exe', source_url='https://ninite.com/sumatrapdf/ninite.exe')
+ # try_and_print(message='Thunderbird.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Thunderbird.exe', source_url='https://ninite.com/thunderbird/ninite.exe')
+
+ # # Ninite - Runtimes
+ # print_success(' '*4 + 'Runtimes')
+ # _path = r'{BaseDir}\Installers\Extras\Runtimes'.format(**global_vars)
+ # try_and_print(message='Adobe Air.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Adobe Air.exe', source_url='https://ninite.com/air/ninite.exe')
+ # try_and_print(message='dotNET.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='dotNET.exe', source_url='https://ninite.com/.net4.7/ninite.exe')
+ # try_and_print(message='Java 8.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Java 8.exe', source_url='https://ninite.com/java8/ninite.exe')
+ # try_and_print(message='Shockwave.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Shockwave.exe', source_url='https://ninite.com/shockwave/ninite.exe')
+ # try_and_print(message='Silverlight.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Silverlight.exe', source_url='https://ninite.com/silverlight/ninite.exe')
+
+ # # Ninite - Security
+ # print_success(' '*4 + 'Security')
+ # _path = r'{BaseDir}\Installers\Extras\Security'.format(**global_vars)
+ # try_and_print(message='Avast.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Avast.exe', source_url='https://ninite.com/avast/ninite.exe')
+ # try_and_print(message='AVG.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='AVG.exe', source_url='https://ninite.com/avg/ninite.exe')
+ # try_and_print(message='Avira.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Avira.exe', source_url='https://ninite.com/avira/ninite.exe')
+ # try_and_print(message='Microsoft Security Essentials.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Microsoft Security Essentials.exe', source_url='https://ninite.com/essentials/ninite.exe')
+ # try_and_print(message='Malwarebytes Anti-Malware.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Malwarebytes Anti-Malware.exe', source_url='https://ninite.com/malwarebytes/ninite.exe')
+ # try_and_print(message='Spybot 2.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Spybot 2.exe', source_url='https://ninite.com/spybot2/ninite.exe')
+ # try_and_print(message='SUPERAntiSpyware.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SUPERAntiSpyware.exe', source_url='https://ninite.com/super/ninite.exe')
+
+ # # Ninite - Utilities
+ # print_success(' '*4 + 'Utilities')
+ # _path = r'{BaseDir}\Installers\Extras\Utilities'.format(**global_vars)
+ # try_and_print(message='CDBurnerXP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CDBurnerXP.exe', source_url='https://ninite.com/cdburnerxp/ninite.exe')
+ # try_and_print(message='Classic Start.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Classic Start.exe', source_url='https://ninite.com/classicstart/ninite.exe')
+ # try_and_print(message='Glary Utilities.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Glary Utilities.exe', source_url='https://ninite.com/glary/ninite.exe')
+ # try_and_print(message='ImgBurn.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='ImgBurn.exe', source_url='https://ninite.com/imgburn/ninite.exe')
+ # try_and_print(message='InfraRecorder.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='InfraRecorder.exe', source_url='https://ninite.com/infrarecorder/ninite.exe')
+ # try_and_print(message='Launchy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Launchy.exe', source_url='https://ninite.com/launchy/ninite.exe')
+ # try_and_print(message='RealVNC.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='RealVNC.exe', source_url='https://ninite.com/realvnc/ninite.exe')
+ # try_and_print(message='Revo Uninstaller.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Revo Uninstaller.exe', source_url='https://ninite.com/revo/ninite.exe')
+ # try_and_print(message='TeamViewer 12.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='TeamViewer 12.exe', source_url='https://ninite.com/teamviewer12/ninite.exe')
+ # try_and_print(message='TeraCopy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='TeraCopy.exe', source_url='https://ninite.com/teracopy/ninite.exe')
+ # try_and_print(message='WinDirStat.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinDirStat.exe', source_url='https://ninite.com/windirstat/ninite.exe')
+
+ # # Ninite - Web Browsers
+ # print_success(' '*4 + 'Web Browsers')
+ # _path = r'{BaseDir}\Installers\Extras\Web Browsers'.format(**global_vars)
+ # try_and_print(message='Google Chrome.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Chrome.exe', source_url='https://ninite.com/chrome/ninite.exe')
+ # try_and_print(message='Mozilla Firefox.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Mozilla Firefox.exe', source_url='https://ninite.com/firefox/ninite.exe')
+ # try_and_print(message='Opera Chromium.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Opera Chromium.exe', source_url='https://ninite.com/operaChromium/ninite.exe')
+ pass
+
+## Misc ##
+def update_everything():
+ pass
+
+def update_notepadplusplus():
+ # Stop running processes
+ kill_process('notepadplusplus.exe')
+
+ # Remove existing folders
+ remove_from_kit('NotepadPlusPlus')
+
+ # Download
+ name = 'npp.7z'
+ url = 'https://notepad-plus-plus.org/repository/7.x/7.5.1/npp.7.5.1.bin.minimalist.7z'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_to_cbin('npp.7z', 'NotepadPlusPlus')
+
+ # Cleanup
+ remove_from_temp('npp.7z')
+
+def update_treesizefree():
+ pass
+
+def update_xmplay():
+ pass
+
+## Repairs ##
+def update_adwcleaner():
+ #def update_adwcleaner():
+ # path = global_vars['BinDir']
+ # name = 'AdwCleaner.exe'
+ # _dl_page = 'http://www.bleepingcomputer.com/download/adwcleaner/dl/125/'
+ # _regex = r'href=.*http(s|)://download\.bleepingcomputer\.com/dl/[a-zA-Z0-9]+/[a-zA-Z0-9]+/windows/security/security-utilities/a/adwcleaner/AdwCleaner\.exe'
+ # url = resolve_dynamic_url(_dl_page, _regex)
+ # download_to_temp(path, name, url)
+ #
+ pass
+
+def update_kvrt():
+ #def update_kvrt():
+ # path = global_vars['BinDir']
+ # name = 'KVRT.exe'
+ # url = 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe'
+ # download_to_temp(path, name, url)
+ pass
+
+def update_rkill():
+ #def update_rkill():
+ # path = '{BinDir}/RKill'.format(**global_vars)
+ # name = 'RKill.exe'
+ # _dl_page = 'http://www.bleepingcomputer.com/download/rkill/dl/10/'
+ # _regex = r'href=.*http(s|)://download\.bleepingcomputer\.com/dl/[a-zA-Z0-9]+/[a-zA-Z0-9]+/windows/security/security-utilities/r/rkill/rkill\.exe'
+ # url = resolve_dynamic_url(_dl_page, _regex)
+ # download_to_temp(path, name, url)
+ pass
+
+def update_tdsskiller():
+ #def update_tdsskiller():
+ # path = global_vars['BinDir']
+ # name = 'TDSSKiller.exe'
+ # url = 'http://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe'
+ # download_to_temp(path, name, url)
+ pass
+
+## Uninstallers ##
+def update_iobit_uninstaller():
+ pass
+
+if __name__ == '__main__':
+ print("This file is not meant to be called directly.")
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 96807cfd..ed9d9e0a 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -6,188 +6,72 @@ import sys
# Init
os.chdir(os.path.dirname(os.path.realpath(__file__)))
sys.path.append(os.getcwd())
-from functions.build import *
+from functions.update import *
init_global_vars()
os.system('title {}: Kit Update Tool'.format(KIT_NAME_FULL))
if __name__ == '__main__':
- print('Loaded update_kit.py!')
- pause('Hmm...')
- exit_script()
try:
other_results = {
'Error': {
- 'CalledProcessError': 'Unknown Error',
+ 'CalledProcessError': 'Unknown Error',
}}
stay_awake()
+ os.system('cls')
+ print_info('Updating Kit Tools')
+
+ ## Download ##
+ # .bin (Not compressed)
+ print_info('\n.bin')
+ try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results)
+ try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results)
+
+ # Data Recovery
+ print_info('\nData Recovery')
+ try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results)
+
+ # Data Transfers
+ print_info('\nData Transfers')
+ try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results)
# Diagnostics
- # print_info('Diagnostics')
- # try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results)
+ print_info('\nDiagnostics')
+ try_and_print(message='AIDA64...', function=update_aida64, other_results=other_results)
+ try_and_print(message='Autoruns...', function=update_autoruns, other_results=other_results)
+ try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results)
+ try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results)
+ try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results)
+ try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results)
+ try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results)
- # VR/OSR
- # print_info('VR/OSR')
- # try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results)
- # try_and_print(message='ESET...', function=update_eset, other_results=other_results)
- # try_and_print(message='JRT...', function=update_jrt, other_results=other_results)
- # try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results)
- # try_and_print(message='RKill...', function=update_rkill, other_results=other_results)
- # try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results)
+ # Drivers
+ print_info('\nDrivers')
+ try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results)
+ try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results)
+ try_and_print(message='Samsing Magician...', function=update_samsing_magician, other_results=other_results)
+ try_and_print(message='Snappy Driver Installer...', function=update_sdi, other_results=other_results)
- # Driver Tools
- print_info('Driver Tools')
- # try_and_print(message='Intel Driver Update Utility...', function=update_intel_driver_utility, other_results=other_results)
- # try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results)
- # try_and_print(message='Samsung Magician...', function=update_samsung_magician, other_results=other_results)
- try_and_print(message='Samsung Magician...', function=update_samsung_magician, silent_function=False)
-
- # Ninite - Bundles
- print_info('Installers')
- print_success(' '*4 + 'Ninite Bundles')
- _path = r'{BaseDir}\Installers\Extras\Bundles'.format(**global_vars)
- try_and_print(message='Runtimes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Runtimes.exe', source_url='https://ninite.com/.net4.7-air-java8-silverlight/ninite.exe')
- try_and_print(message='Legacy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Legacy.exe', source_url='https://ninite.com/.net4.7-7zip-air-chrome-firefox-java8-silverlight-vlc/ninite.exe')
- try_and_print(message='Modern.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Modern.exe', source_url='https://ninite.com/.net4.7-7zip-air-chrome-classicstart-firefox-java8-silverlight-vlc/ninite.exe')
-
- # Ninite - Audio-Video
- print_success(' '*4 + 'Audio-Video')
- _path = r'{BaseDir}\Installers\Extras\Audio-Video'.format(**global_vars)
- try_and_print(message='AIMP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='AIMP.exe', source_url='https://ninite.com/aimp/ninite.exe')
- try_and_print(message='Audacity.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Audacity.exe', source_url='https://ninite.com/audacity/ninite.exe')
- try_and_print(message='CCCP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CCCP.exe', source_url='https://ninite.com/cccp/ninite.exe')
- try_and_print(message='Foobar2000.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Foobar2000.exe', source_url='https://ninite.com/foobar/ninite.exe')
- try_and_print(message='GOM.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='GOM.exe', source_url='https://ninite.com/gom/ninite.exe')
- try_and_print(message='iTunes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='HandBrake.exe', source_url='https://ninite.com/handbrake/ninite.exe')
- try_and_print(message='iTunes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='iTunes.exe', source_url='https://ninite.com/itunes/ninite.exe')
- try_and_print(message='K-Lite Codecs.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='K-Lite Codecs.exe', source_url='https://ninite.com/klitecodecs/ninite.exe')
- try_and_print(message='MediaMonkey.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='MediaMonkey.exe', source_url='https://ninite.com/mediamonkey/ninite.exe')
- try_and_print(message='MusicBee.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='MusicBee.exe', source_url='https://ninite.com/musicbee/ninite.exe')
- try_and_print(message='Spotify.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Spotify.exe', source_url='https://ninite.com/spotify/ninite.exe')
- try_and_print(message='VLC.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='VLC.exe', source_url='https://ninite.com/vlc/ninite.exe')
- try_and_print(message='Winamp.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Winamp.exe', source_url='https://ninite.com/winamp/ninite.exe')
-
- # Ninite - Cloud Storage
- print_success(' '*4 + 'Cloud Storage')
- _path = r'{BaseDir}\Installers\Extras\Cloud Storage'.format(**global_vars)
- try_and_print(message='Dropbox.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Dropbox.exe', source_url='https://ninite.com/dropbox/ninite.exe')
- try_and_print(message='Google Backup & Sync.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Backup & Sync.exe', source_url='https://ninite.com/googlebackupandsync/ninite.exe')
- try_and_print(message='Mozy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Mozy.exe', source_url='https://ninite.com/mozy/ninite.exe')
- try_and_print(message='OneDrive.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='OneDrive.exe', source_url='https://ninite.com/onedrive/ninite.exe')
- try_and_print(message='SugarSync.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SugarSync.exe', source_url='https://ninite.com/sugarsync/ninite.exe')
-
- # Ninite - Communication
- print_success(' '*4 + 'Communication')
- _path = r'{BaseDir}\Installers\Extras\Communication'.format(**global_vars)
- try_and_print(message='Pidgin.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Pidgin.exe', source_url='https://ninite.com/pidgin/ninite.exe')
- try_and_print(message='Skype.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Skype.exe', source_url='https://ninite.com/skype/ninite.exe')
- try_and_print(message='Trillian.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Trillian.exe', source_url='https://ninite.com/trillian/ninite.exe')
-
- # Ninite - Compression
- print_success(' '*4 + 'Compression')
- _path = r'{BaseDir}\Installers\Extras\Compression'.format(**global_vars)
- try_and_print(message='7-Zip.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='7-Zip.exe', source_url='https://ninite.com/7zip/ninite.exe')
- try_and_print(message='PeaZip.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PeaZip.exe', source_url='https://ninite.com/peazip/ninite.exe')
- try_and_print(message='WinRAR.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinRAR.exe', source_url='https://ninite.com/winrar/ninite.exe')
-
- # Ninite - Developer
- print_success(' '*4 + 'Developer')
- _path = r'{BaseDir}\Installers\Extras\Developer'.format(**global_vars)
- try_and_print(message='Eclipse.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Eclipse.exe', source_url='https://ninite.com/eclipse/ninite.exe')
- try_and_print(message='FileZilla.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='FileZilla.exe', source_url='https://ninite.com/filezilla/ninite.exe')
- try_and_print(message='JDK 8.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='JDK 8.exe', source_url='https://ninite.com/jdk8/ninite.exe')
- try_and_print(message='JDK 8 (x64).exe', function=download_file, other_results=other_results, out_dir=_path, out_name='JDK 8 (x64).exe', source_url='https://ninite.com/jdkx8/ninite.exe')
- try_and_print(message='Notepad++.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Notepad++.exe', source_url='https://ninite.com/notepadplusplus/ninite.exe')
- try_and_print(message='PuTTY.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PuTTY.exe', source_url='https://ninite.com/putty/ninite.exe')
- try_and_print(message='Python 2.7.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Python 2.exe', source_url='https://ninite.com/python/ninite.exe')
- try_and_print(message='Visual Studio Code.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Visual Studio Code.exe', source_url='https://ninite.com/vscode/ninite.exe')
- try_and_print(message='WinMerge.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinMerge.exe', source_url='https://ninite.com/winmerge/ninite.exe')
- try_and_print(message='WinSCP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinSCP.exe', source_url='https://ninite.com/winscp/ninite.exe')
-
- # Ninite - File Sharing
- print_success(' '*4 + 'File Sharing')
- _path = r'{BaseDir}\Installers\Extras\File Sharing'.format(**global_vars)
- try_and_print(message='qBittorrent.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='qBittorrent.exe', source_url='https://ninite.com/qbittorrent/ninite.exe')
-
- # Ninite - Image-Photo
- print_success(' '*4 + 'Image-Photo')
- _path = r'{BaseDir}\Installers\Extras\Image-Photo'.format(**global_vars)
- try_and_print(message='Blender.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Blender.exe', source_url='https://ninite.com/blender/ninite.exe')
- try_and_print(message='FastStone.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='FastStone.exe', source_url='https://ninite.com/faststone/ninite.exe')
- try_and_print(message='GIMP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='GIMP.exe', source_url='https://ninite.com/gimp/ninite.exe')
- try_and_print(message='Greenshot.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Greenshot.exe', source_url='https://ninite.com/greenshot/ninite.exe')
- try_and_print(message='Inkscape.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Inkscape.exe', source_url='https://ninite.com/inkscape/ninite.exe')
- try_and_print(message='IrfanView.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='IrfanView.exe', source_url='https://ninite.com/irfanview/ninite.exe')
- try_and_print(message='Krita.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Krita.exe', source_url='https://ninite.com/krita/ninite.exe')
- try_and_print(message='Paint.NET.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Paint.NET.exe', source_url='https://ninite.com/paint.net/ninite.exe')
- try_and_print(message='ShareX.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='ShareX.exe', source_url='https://ninite.com/sharex/ninite.exe')
- try_and_print(message='XnView.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='XnView.exe', source_url='https://ninite.com/xnview/ninite.exe')
-
- # Ninite - Misc
- print_success(' '*4 + 'Misc')
- _path = r'{BaseDir}\Installers\Extras\Misc'.format(**global_vars)
- try_and_print(message='Evernote.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Evernote.exe', source_url='https://ninite.com/evernote/ninite.exe')
- try_and_print(message='Everything.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Everything.exe', source_url='https://ninite.com/everything/ninite.exe')
- try_and_print(message='KeePass 2.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='KeePass 2.exe', source_url='https://ninite.com/keepass2/ninite.exe')
- try_and_print(message='Google Earth.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Earth.exe', source_url='https://ninite.com/googleearth/ninite.exe')
- try_and_print(message='NV Access.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='NV Access.exe', source_url='https://ninite.com/nvda/ninite.exe')
- try_and_print(message='Steam.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Steam.exe', source_url='https://ninite.com/steam/ninite.exe')
-
- # Ninite - Office
- print_success(' '*4 + 'Office')
- _path = r'{BaseDir}\Installers\Extras\Office'.format(**global_vars)
- try_and_print(message='CutePDF.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CutePDF.exe', source_url='https://ninite.com/cutepdf/ninite.exe')
- try_and_print(message='Foxit Reader.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Foxit Reader.exe', source_url='https://ninite.com/foxit/ninite.exe')
- try_and_print(message='LibreOffice.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='LibreOffice.exe', source_url='https://ninite.com/libreoffice/ninite.exe')
- try_and_print(message='OpenOffice.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='OpenOffice.exe', source_url='https://ninite.com/openoffice/ninite.exe')
- try_and_print(message='PDFCreator.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PDFCreator.exe', source_url='https://ninite.com/pdfcreator/ninite.exe')
- try_and_print(message='SumatraPDF.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SumatraPDF.exe', source_url='https://ninite.com/sumatrapdf/ninite.exe')
- try_and_print(message='Thunderbird.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Thunderbird.exe', source_url='https://ninite.com/thunderbird/ninite.exe')
-
- # Ninite - Runtimes
- print_success(' '*4 + 'Runtimes')
- _path = r'{BaseDir}\Installers\Extras\Runtimes'.format(**global_vars)
- try_and_print(message='Adobe Air.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Adobe Air.exe', source_url='https://ninite.com/air/ninite.exe')
- try_and_print(message='dotNET.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='dotNET.exe', source_url='https://ninite.com/.net4.7/ninite.exe')
- try_and_print(message='Java 8.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Java 8.exe', source_url='https://ninite.com/java8/ninite.exe')
- try_and_print(message='Shockwave.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Shockwave.exe', source_url='https://ninite.com/shockwave/ninite.exe')
- try_and_print(message='Silverlight.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Silverlight.exe', source_url='https://ninite.com/silverlight/ninite.exe')
-
- # Ninite - Security
- print_success(' '*4 + 'Security')
- _path = r'{BaseDir}\Installers\Extras\Security'.format(**global_vars)
- try_and_print(message='Avast.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Avast.exe', source_url='https://ninite.com/avast/ninite.exe')
- try_and_print(message='AVG.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='AVG.exe', source_url='https://ninite.com/avg/ninite.exe')
- try_and_print(message='Avira.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Avira.exe', source_url='https://ninite.com/avira/ninite.exe')
- try_and_print(message='Microsoft Security Essentials.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Microsoft Security Essentials.exe', source_url='https://ninite.com/essentials/ninite.exe')
- try_and_print(message='Malwarebytes Anti-Malware.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Malwarebytes Anti-Malware.exe', source_url='https://ninite.com/malwarebytes/ninite.exe')
- try_and_print(message='Spybot 2.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Spybot 2.exe', source_url='https://ninite.com/spybot2/ninite.exe')
- try_and_print(message='SUPERAntiSpyware.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SUPERAntiSpyware.exe', source_url='https://ninite.com/super/ninite.exe')
-
- # Ninite - Utilities
- print_success(' '*4 + 'Utilities')
- _path = r'{BaseDir}\Installers\Extras\Utilities'.format(**global_vars)
- try_and_print(message='CDBurnerXP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CDBurnerXP.exe', source_url='https://ninite.com/cdburnerxp/ninite.exe')
- try_and_print(message='Classic Start.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Classic Start.exe', source_url='https://ninite.com/classicstart/ninite.exe')
- try_and_print(message='Glary Utilities.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Glary Utilities.exe', source_url='https://ninite.com/glary/ninite.exe')
- try_and_print(message='ImgBurn.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='ImgBurn.exe', source_url='https://ninite.com/imgburn/ninite.exe')
- try_and_print(message='InfraRecorder.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='InfraRecorder.exe', source_url='https://ninite.com/infrarecorder/ninite.exe')
- try_and_print(message='Launchy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Launchy.exe', source_url='https://ninite.com/launchy/ninite.exe')
- try_and_print(message='RealVNC.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='RealVNC.exe', source_url='https://ninite.com/realvnc/ninite.exe')
- try_and_print(message='Revo Uninstaller.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Revo Uninstaller.exe', source_url='https://ninite.com/revo/ninite.exe')
- try_and_print(message='TeamViewer 12.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='TeamViewer 12.exe', source_url='https://ninite.com/teamviewer12/ninite.exe')
- try_and_print(message='TeraCopy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='TeraCopy.exe', source_url='https://ninite.com/teracopy/ninite.exe')
- try_and_print(message='WinDirStat.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinDirStat.exe', source_url='https://ninite.com/windirstat/ninite.exe')
-
- # Ninite - Web Browsers
- print_success(' '*4 + 'Web Browsers')
- _path = r'{BaseDir}\Installers\Extras\Web Browsers'.format(**global_vars)
- try_and_print(message='Google Chrome.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Chrome.exe', source_url='https://ninite.com/chrome/ninite.exe')
- try_and_print(message='Mozilla Firefox.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Mozilla Firefox.exe', source_url='https://ninite.com/firefox/ninite.exe')
- try_and_print(message='Opera Chromium.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Opera Chromium.exe', source_url='https://ninite.com/operaChromium/ninite.exe')
+ # Installers
+ print_info('\nInstallers')
+ try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results)
+ try_and_print(message='Ninite Installers...', function=update_ninite, other_results=other_results)
# Misc
- # print_info('Misc')
- # try_and_print(message='SysinternalsSuite...', function=update_sysinternalssuite, other_results=other_results)
+ print_info('\nMisc')
+ try_and_print(message='Everything...', function=update_everything, other_results=other_results)
+ try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results)
+ try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results)
+
+ # Repairs
+ print_info('\nRepairs')
+ try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results)
+ try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results)
+ try_and_print(message='RKill...', function=update_rkill, other_results=other_results)
+ try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results)
+
+ # Uninstallers
+ print_info('\nUninstallers')
+ try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results)
# Done
print_standard('\nDone.')
diff --git a/.bin/AIDA64/full.rpf b/.cbin/_include/AIDA64/full.rpf
similarity index 100%
rename from .bin/AIDA64/full.rpf
rename to .cbin/_include/AIDA64/full.rpf
diff --git a/.bin/AIDA64/installed_programs.rpf b/.cbin/_include/AIDA64/installed_programs.rpf
similarity index 100%
rename from .bin/AIDA64/installed_programs.rpf
rename to .cbin/_include/AIDA64/installed_programs.rpf
diff --git a/.bin/AIDA64/licenses.rpf b/.cbin/_include/AIDA64/licenses.rpf
similarity index 100%
rename from .bin/AIDA64/licenses.rpf
rename to .cbin/_include/AIDA64/licenses.rpf
diff --git a/.bin/NotepadPlusPlus/config.xml b/.cbin/_include/NotepadPlusPlus/config.xml
similarity index 100%
rename from .bin/NotepadPlusPlus/config.xml
rename to .cbin/_include/NotepadPlusPlus/config.xml
diff --git a/.bin/XYplorerFree/Data/XYplorer.ini b/.cbin/_include/XYplorerFree/Data/XYplorer.ini
similarity index 100%
rename from .bin/XYplorerFree/Data/XYplorer.ini
rename to .cbin/_include/XYplorerFree/Data/XYplorer.ini
diff --git a/.gitignore b/.gitignore
index bf961f6b..abb51302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
.bin/ConEmu/
.bin/Erunt/
.bin/Everything/
+.bin/FastCopy/
.bin/HWiNFO/HWiNFO*.ini
.bin/NotepadPlusPlus/
.bin/ProcessKiller/
@@ -14,4 +15,7 @@
.bin/Python/
.bin/Tmp/
.bin/XMPlay/
-.cbin/
+.cbin/AIDA64/
+.cbin/ProduKey/
+.cbin/TestDisk/
+.cbin/XYplorerFree/
diff --git a/UPDATEME.cmd b/UPDATEME.cmd
new file mode 100644
index 00000000..3897f26b
--- /dev/null
+++ b/UPDATEME.cmd
@@ -0,0 +1,130 @@
+:: Wizard Kit: Launcher Script ::
+::
+:: This script works by setting env variables and then calling Launch.cmd
+:: which inherits the variables. This bypasses batch file argument parsing
+:: which is awful.
+@echo off
+
+:Init
+setlocal EnableDelayedExpansion
+title Wizard Kit: Launcher
+call :CheckFlags %*
+call :FindBin
+call :SetTitle Launcher
+
+:Optional
+:: This section is for any work that needs done before launching L_ITEM
+rem EXTRA_CODE_GOES_HERE
+
+:DefineLaunch
+:: Set L_TYPE to one of these options:
+:: Console, Folder, Office, Program, PSScript, or PyScript
+:: Set L_PATH to the path to the program folder
+:: NOTE: Launch.cmd will test for L_PATH in the following order:
+:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
+:: 2: %bin%\L_PATH
+:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
+:: Set L_ITEM to one of the following:
+:: 1. The filename of the item to launch
+:: 2. The Office product to install
+:: 3. '.' to open extracted folder
+:: Set L_ARGS to include any necessary arguments (if any)
+:: Set L_7ZIP to include any necessary arguments for extraction
+:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
+:: Set L_ELEV to True to launch with elevated permissions
+:: Set L_NCMD to True to stay in the native console window
+:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
+set L_TYPE=PyScript
+set L_PATH=Scripts
+set L_ITEM=update_kit.py
+set L_ARGS=
+set L_7ZIP=
+set L_CHCK=True
+set L_ELEV=
+set L_NCMD=
+set L_WAIT=
+
+:::::::::::::::::::::::::::::::::::::::::::
+:: Do not edit anything below this line! ::
+:::::::::::::::::::::::::::::::::::::::::::
+
+:LaunchPrep
+rem Verifies the environment before launching item
+if not defined bin (goto ErrorNoBin)
+if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
+
+:Launch
+rem Calls the Launch.cmd script using the variables defined above
+call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
+goto Exit
+
+:: Functions ::
+:CheckFlags
+rem Loops through all arguments to check for accepted flags
+set DEBUG=
+for %%f in (%*) do (
+ if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
+)
+@exit /b 0
+
+:FindBin
+rem Checks the current directory and all parents for the ".bin" folder
+rem NOTE: Has not been tested for UNC paths
+set bin=
+pushd "%~dp0"
+:FindBinInner
+if exist ".bin" (goto FindBinDone)
+if "%~d0\" == "%cd%" (popd & @exit /b 1)
+cd ..
+goto FindBinInner
+:FindBinDone
+set "bin=%cd%\.bin"
+set "cbin=%cd%\.cbin"
+popd
+@exit /b 0
+
+:SetTitle
+rem Sets title using KIT_NAME_FULL from settings\main.py
+set "SETTINGS=%bin%\Scripts\settings\main.py"
+for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
+ set "_v=%%f"
+ set "_v=!_v:*'=!"
+ set "KIT_NAME_FULL=!_v:~0,-1!"
+)
+set "window_title=%*"
+if not defined window_title set "window_title=Launcher"
+set "window_title=%KIT_NAME_FULL%: %window_title%"
+title %window_title%
+@exit /b 0
+
+:: Errors ::
+:ErrorLaunchCMD
+echo.
+echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
+goto Abort
+
+:ErrorLaunchCMDMissing
+echo.
+echo ERROR: Launch.cmd script not found.
+goto Abort
+
+:ErrorNoBin
+echo.
+echo ERROR: ".bin" folder not found.
+goto Abort
+
+:Abort
+color 4e
+echo Aborted.
+echo.
+echo Press any key to exit...
+pause>nul
+color
+rem Set errorlevel to 1 by calling color incorrectly
+color 00
+goto Exit
+
+:: Cleanup and exit ::
+:Exit
+endlocal
+exit /b %errorlevel%
\ No newline at end of file
From 4bf7d000e3ec25dfbaaeaf85fc1a740f3eb94dbe Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Sun, 19 Nov 2017 18:51:03 -0800
Subject: [PATCH 04/20] update.py rewrite still in progress
TODO:
* Finish the download sections
* Add section to compress the folders/files in .cbin
---
.bin/Scripts/functions/common.py | 16 +-
.bin/Scripts/functions/update.py | 646 ++++++++++--------
.bin/Scripts/update_kit.py | 12 +-
.../_include/BleachBit-Portable/BleachBit.ini | 77 +++
.../_Drivers/Intel RST/SetupRST_13.x.txt | 1 +
.gitignore | 5 +
6 files changed, 478 insertions(+), 279 deletions(-)
create mode 100644 .cbin/_include/BleachBit-Portable/BleachBit.ini
create mode 100644 .cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt
diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py
index 5d2a7dfd..a204fef5 100644
--- a/.bin/Scripts/functions/common.py
+++ b/.bin/Scripts/functions/common.py
@@ -36,16 +36,14 @@ TOOLS = {
'32': r'Autoruns\autoruns.exe',
'64': r'Autoruns\autoruns64.exe'},
'BleachBit': {
- '32': r'BleachBit\bleachbit_console.exe'},
+ '32': r'BleachBit-Portable\bleachbit_console.exe'},
'Caffeine': {
- '32': r'caffeine\caffeine.exe'},
- 'curl': {
- '32': r'curl\curl.exe'},
+ '32': r'Caffeine\caffeine.exe'},
'Du': {
- '32': r'du\du.exe',
- '64': r'du\du64.exe'},
+ '32': r'Du\du.exe',
+ '64': r'Du\du64.exe'},
'ERUNT': {
- '32': r'erunt\ERUNT.EXE'},
+ '32': r'ERUNT\ERUNT.EXE'},
'Everything': {
'32': r'Everything\Everything.exe',
'64': r'Everything\Everything64.exe'},
@@ -61,7 +59,7 @@ TOOLS = {
'KVRT': {
'32': r'KVRT\KVRT.exe'},
'NotepadPlusPlus': {
- '32': r'notepadplusplus\notepadplusplus.exe'},
+ '32': r'NotepadPlusPlus\notepadplusplus.exe'},
'ProduKey': {
'32': r'ProduKey\ProduKey.exe',
'64': r'ProduKey\ProduKey64.exe'},
@@ -72,7 +70,7 @@ TOOLS = {
'SevenZip': {
'32': r'7-Zip\7za.exe',
'64': r'7-Zip\7za64.exe'},
- 'TDSSKille': {
+ 'TDSSKiller': {
'32': r'TDSSKiller\TDSSKiller.exe'},
'wimlib-imagex': {
'32': r'wimlib\x32\wimlib-imagex.exe',
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 43b1f5db..a5c39450 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -6,14 +6,141 @@ import requests
from functions.common import *
from settings.launchers import *
-def download_to_temp(out_name, source_url):
+NINITE_FILES = {
+ 'Bundles': {
+ 'Runtimes.exe': '.net4.7-air-java8-silverlight',
+ 'Legacy.exe': '.net4.7-7zip-air-chrome-firefox-java8-silverlight-vlc',
+ 'Modern.exe': '.net4.7-7zip-air-chrome-classicstart-firefox-java8-silverlight-vlc',
+ },
+ 'Audio-Video': {
+ 'AIMP.exe': 'aimp',
+ 'Audacity.exe': 'audacity',
+ 'CCCP.exe': 'cccp',
+ 'Foobar2000.exe': 'foobar',
+ 'GOM.exe': 'gom',
+ 'HandBrake.exe': 'handbrake',
+ 'iTunes.exe': 'itunes',
+ 'K-Lite Codecs.exe': 'klitecodecs',
+ 'MediaMonkey.exe': 'mediamonkey',
+ 'MusicBee.exe': 'musicbee',
+ 'Spotify.exe': 'spotify',
+ 'VLC.exe': 'vlc',
+ 'Winamp.exe': 'winamp',
+ },
+ 'Cloud Storage': {
+ 'Dropbox.exe': 'dropbox',
+ 'Google Backup & Sync.exe': 'googlebackupandsync',
+ 'Mozy.exe': 'mozy',
+ 'OneDrive.exe': 'onedrive',
+ 'SugarSync.exe': 'sugarsync',
+ },
+ 'Communication': {
+ 'Pidgin.exe': 'pidgin',
+ 'Skype.exe': 'skype',
+ 'Trillian.exe': 'trillian',
+ },
+ 'Compression': {
+ '7-Zip.exe': '7zip',
+ 'PeaZip.exe': 'peazip',
+ 'WinRAR.exe': 'winrar',
+ },
+ 'Developer': {
+ 'Eclipse.exe': 'eclipse',
+ 'FileZilla.exe': 'filezilla',
+ 'JDK 8.exe': 'jdk8',
+ 'JDK 8 (x64).exe': 'jdkx8',
+ 'Notepad++.exe': 'notepadplusplus',
+ 'PuTTY.exe': 'putty',
+ 'Python 2.exe': 'python',
+ 'Visual Studio Code.exe': 'vscode',
+ 'WinMerge.exe': 'winmerge',
+ 'WinSCP.exe': 'winscp',
+ },
+ 'File Sharing': {
+ 'qBittorrent.exe': 'qbittorrent',
+ },
+ 'Image-Photo': {
+ 'Blender.exe': 'blender',
+ 'FastStone.exe': 'faststone',
+ 'GIMP.exe': 'gimp',
+ 'Greenshot.exe': 'greenshot',
+ 'Inkscape.exe': 'inkscape',
+ 'IrfanView.exe': 'irfanview',
+ 'Krita.exe': 'krita',
+ 'Paint.NET.exe': 'paint.net',
+ 'ShareX.exe': 'sharex',
+ 'XnView.exe': 'xnview',
+ },
+ 'Misc': {
+ 'Evernote.exe': 'evernote',
+ 'Everything.exe': 'everything',
+ 'KeePass 2.exe': 'keepass2',
+ 'Google Earth.exe': 'googleearth',
+ 'NV Access.exe': 'nvda',
+ 'Steam.exe': 'steam',
+ },
+ 'Office': {
+ 'CutePDF.exe': 'cutepdf',
+ 'Foxit Reader.exe': 'foxit',
+ 'LibreOffice.exe': 'libreoffice',
+ 'OpenOffice.exe': 'openoffice',
+ 'PDFCreator.exe': 'pdfcreator',
+ 'SumatraPDF.exe': 'sumatrapdf',
+ 'Thunderbird.exe': 'thunderbird',
+ },
+ 'Runtimes': {
+ 'Adobe Air.exe': 'air',
+ 'dotNET.exe': '.net4.7',
+ 'Java 8.exe': 'java8',
+ 'Shockwave.exe': 'shockwave',
+ 'Silverlight.exe': 'silverlight',
+ },
+ 'Security': {
+ 'Avast.exe': 'avast',
+ 'AVG.exe': 'avg',
+ 'Avira.exe': 'avira',
+ 'Microsoft Security Essentials.exe': 'essentials',
+ 'Malwarebytes Anti-Malware.exe': 'malwarebytes',
+ 'Spybot 2.exe': 'spybot2',
+ 'SUPERAntiSpyware.exe': 'super',
+ },
+ 'Utilities': {
+ 'CDBurnerXP.exe': 'cdburnerxp',
+ 'Classic Start.exe': 'classicstart',
+ 'Glary Utilities.exe': 'glary',
+ 'ImgBurn.exe': 'imgburn',
+ 'InfraRecorder.exe': 'infrarecorder',
+ 'Launchy.exe': 'launchy',
+ 'RealVNC.exe': 'realvnc',
+ 'Revo Uninstaller.exe': 'revo',
+ 'TeamViewer 12.exe': 'teamviewer12',
+ 'TeraCopy.exe': 'teracopy',
+ 'WinDirStat.exe': 'windirstat',
+ },
+ 'Web Browsers': {
+ 'Google Chrome.exe': 'chrome',
+ 'Mozilla Firefox.exe': 'firefox',
+ 'Opera Chromium.exe': 'operaChromium',
+ },
+ }
+RST_FILES = {
+ #SetupRST_12.0.exe : Removed from download center?
+ #SetupRST_12.5.exe : Removed from download center?
+ #SetupRST_12.8.exe : Removed from download center?
+ 'SetupRST_12.9.exe': 'https://downloadmirror.intel.com/23496/eng/SetupRST.exe',
+ #SetupRST_13.x.exe : Broken, doesn't support > .NET 4.5
+ 'SetupRST_14.0.exe': 'https://downloadmirror.intel.com/25091/eng/SetupRST.exe',
+ 'SetupRST_14.8.exe': 'https://downloadmirror.intel.com/26759/eng/setuprst.exe',
+ 'SetupRST_15.8.exe': 'https://downloadmirror.intel.com/27147/eng/SetupRST.exe',
+ }
+
+def download_generic(out_dir, out_name, source_url):
"""Downloads a file using requests."""
## Code based on this Q&A: https://stackoverflow.com/q/16694907
### Asked by: https://stackoverflow.com/users/427457/roman-podlinov
### Edited by: https://stackoverflow.com/users/657427/christophe-roussy
### Using answer: https://stackoverflow.com/a/39217788
### Answer from: https://stackoverflow.com/users/4323/john-zwinck
- out_dir = global_vars['TmpDir']
os.makedirs(out_dir, exist_ok=True)
out_path = '{}/{}'.format(out_dir, out_name)
try:
@@ -24,6 +151,9 @@ def download_to_temp(out_name, source_url):
except:
raise GenericError('Failed to download file.')
+def download_to_temp(out_name, source_url):
+ download_generic(global_vars['TmpDir'], out_name, source_url)
+
def resolve_dynamic_url(source_url, regex, tmp_file='webpage.tmp'):
"""Scan source_url for a url using the regex provided; returns str."""
# Download the "download page"
@@ -47,83 +177,43 @@ def resolve_dynamic_url(source_url, regex, tmp_file='webpage.tmp'):
os.remove(tmp_file)
return url
-def extract_from_temp(source, root, dest, *args):
+def extract_generic(source, dest, mode='x', sz_args=[]):
cmd = [
global_vars['Tools']['SevenZip'],
- 'e', r'{}\{}'.format(global_vars['TmpDir'], source),
- r'-o{}\{}'.format(root, dest),
+ mode, source, r'-o{}'.format(dest),
'-aoa', '-bso0', '-bse0',
]
- cmd.extend(args)
+ cmd.extend(sz_args)
run_program(cmd)
-def extract_to_bin(source, item, *args):
- extract_from_temp(source, global_vars['BinDir'], item, *args)
+def extract_temp_to_bin(source, item, mode='x', sz_args=[]):
+ source = r'{}\{}'.format(global_vars['TmpDir'], source)
+ dest = r'{}\{}'.format(global_vars['BinDir'], item)
+ extract_generic(source, dest, mode, sz_args)
-def extract_to_cbin(source, item, *args):
+def extract_temp_to_cbin(source, item, mode='x', sz_args=[]):
+ source = r'{}\{}'.format(global_vars['TmpDir'], source)
dest = r'{}\{}'.format(global_vars['CBinDir'], item)
include_path = r'{}\_include\{}'.format(global_vars['CBinDir'], item)
if os.path.exists(include_path):
shutil.copytree(include_path, dest)
- extract_from_temp(source, global_vars['CBinDir'], item, *args)
+ extract_generic(source, dest, mode, sz_args)
def remove_from_kit(item):
- bin_path = r'{}\{}'.format(global_vars['BinDir'], item)
- cbin_path = r'{}\{}'.format(global_vars['CBinDir'], item)
- shutil.rmtree(bin_path, ignore_errors=True)
- shutil.rmtree(cbin_path, ignore_errors=True)
+ item_locations = []
+ for p in [global_vars['BinDir'], global_vars['CBinDir']]:
+ item_locations.append(r'{}\{}'.format(p, item))
+ item_locations.append(r'{}\_Drivers\{}'.format(p, item))
+ for item_path in item_locations:
+ if os.path.exists(item_path):
+ if os.path.isdir(item_path):
+ shutil.rmtree(item_path, ignore_errors=True)
+ else:
+ os.remove(item_path)
def remove_from_temp(item):
os.remove(r'{}\{}'.format(global_vars['TmpDir'], item))
-## .bin (NOT compressed) ##
-def update_fastcopy():
- # Stop running processes
- for process in ['FastCopy.exe', 'FastCopy64.exe']:
- kill_process(process)
-
- # Download
- name = 'FastCopy32.zip'
- url = 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip'
- download_to_temp(name, url)
-
- name = 'FastCopy64.zip'
- url = 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip'
- download_to_temp(name, url)
-
- # Extract
- extract_to_bin('FastCopy64.zip', 'FastCopy', 'FastCopy.exe')
- shutil.move(
- r'{}\FastCopy\FastCopy.exe'.format(global_vars['BinDir']),
- r'{}\FastCopy\FastCopy64.exe'.format(global_vars['BinDir']))
- extract_to_bin('FastCopy32.zip', 'FastCopy', r'-x!setup.exe', r'-x!*.dll')
-
- # Cleanup
- remove_from_temp('FastCopy32.zip')
- remove_from_temp('FastCopy64.zip')
-
-def update_hwinfo():
- # Stop running processes
- for exe in ['HWiNFO32.exe', 'HWiNFO64.exe']:
- kill_process(exe)
-
- # Download
- name = 'HWiNFO32.zip'
- url = 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip'
- download_to_temp(name, url)
-
- name = 'HWiNFO64.zip'
- url = 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip'
- download_to_temp(name, url)
-
- # Extract files
- extract_to_bin('HWiNFO32.zip', 'HWiNFO')
- extract_to_bin('HWiNFO64.zip', 'HWiNFO')
-
- # Cleanup
- remove_from_temp('HWiNFO32.zip')
- remove_from_temp('HWiNFO64.zip')
-
## Data Recovery ##
def update_testdisk():
# Stop running processes
@@ -140,12 +230,48 @@ def update_testdisk():
download_to_temp(name, url)
# Extract files
- extract_to_cbin('testdisk_wip.zip', 'TestDisk')
+ extract_temp_to_cbin('testdisk_wip.zip', 'TestDisk')
+ dest = r'{}\TestDisk'.format(global_vars['CBinDir'])
+ for item in os.scandir(r'{}\testdisk-7.1-WIP'.format(dest)):
+ dest_item = '{}\{}'.format(dest, item.name)
+ if not os.path.exists(dest_item):
+ shutil.move(item.path, dest_item)
+ shutil.rmtree(
+ r'{}\TestDisk\testdisk-7.1-WIP'.format(global_vars['CBinDir']))
# Cleanup
remove_from_temp('testdisk_wip.zip')
## Data Transfers ##
+def update_fastcopy():
+ ## NOTE: Lives in .bin uncompressed
+ # Stop running processes
+ for process in ['FastCopy.exe', 'FastCopy64.exe']:
+ kill_process(process)
+
+ # Remove existing folders
+ remove_from_kit('FastCopy')
+
+ # Download
+ name = 'FastCopy32.zip'
+ url = 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip'
+ download_to_temp(name, url)
+
+ name = 'FastCopy64.zip'
+ url = 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip'
+ download_to_temp(name, url)
+
+ # Extract
+ extract_temp_to_bin('FastCopy64.zip', 'FastCopy', sz_args=['FastCopy.exe'])
+ shutil.move(
+ r'{}\FastCopy\FastCopy.exe'.format(global_vars['BinDir']),
+ r'{}\FastCopy\FastCopy64.exe'.format(global_vars['BinDir']))
+ extract_temp_to_bin('FastCopy32.zip', 'FastCopy', sz_args=[r'-x!setup.exe', r'-x!*.dll'])
+
+ # Cleanup
+ remove_from_temp('FastCopy32.zip')
+ remove_from_temp('FastCopy64.zip')
+
def update_xyplorer():
# Stop running processes
kill_process('XYplorerFree.exe')
@@ -159,7 +285,7 @@ def update_xyplorer():
download_to_temp(name, url)
# Extract files
- extract_to_cbin('xyplorer_free.zip', 'XYplorerFree')
+ extract_temp_to_cbin('xyplorer_free.zip', 'XYplorerFree')
# Cleanup
remove_from_temp('xyplorer_free.zip')
@@ -178,38 +304,170 @@ def update_aida64():
download_to_temp(name, url)
# Extract files
- extract_to_cbin('aida64.zip', 'AIDA64')
+ extract_temp_to_cbin('aida64.zip', 'AIDA64')
# Cleanup
remove_from_temp('aida64.zip')
def update_autoruns():
- pass
+ # Stop running processes
+ kill_process('Autoruns.exe')
+ kill_process('Autoruns64.exe')
+
+ # Remove existing folders
+ remove_from_kit('Autoruns')
+
+ # Download
+ name = 'Autoruns.zip'
+ url = 'https://download.sysinternals.com/files/Autoruns.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_temp_to_cbin('Autoruns.zip', 'Autoruns')
+
+ # Cleanup
+ remove_from_temp('Autoruns.zip')
def update_bleachbit():
- pass
+ # Stop running processes
+ kill_process('bleachbit.exe')
+
+ # Remove existing folders
+ remove_from_kit('BleachBit-Portable')
+
+ # Download
+ name = 'BleachBit-Portable.zip'
+ url = 'https://download.bleachbit.org/beta/1.17/BleachBit-1.17-portable.zip'
+ download_to_temp(name, url)
+ name = 'Winapp2.zip'
+ url = 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_temp_to_cbin('BleachBit-Portable.zip', 'BleachBit-Portable')
+ extract_generic(
+ r'{}\Winapp2.zip'.format(global_vars['TmpDir']),
+ r'{}\BleachBit-Portable\cleaners'.format(global_vars['CBinDir']),
+ mode='e', sz_args=[r'Winapp2-master\Non-CCleaner\Winapp2.ini'])
+
+ # Move files into place
+ dest = r'{}\BleachBit-Portable'.format(global_vars['CBinDir'])
+ for item in os.scandir(r'{}\BleachBit-Portable'.format(dest)):
+ dest_item = '{}\{}'.format(dest, item.name)
+ if not os.path.exists(dest_item):
+ shutil.move(item.path, dest_item)
+ shutil.rmtree(
+ r'{}\BleachBit-Portable\BleachBit-Portable'.format(global_vars['CBinDir']))
+
+ # Cleanup
+ remove_from_temp('BleachBit-Portable.zip')
+ remove_from_temp('Winapp2.zip')
def update_bluescreenview():
- pass
+ # Stop running processes
+ for exe in ['BlueScreenView.exe', 'BlueScreenView64.exe']:
+ kill_process(exe)
+
+ # Remove existing folders
+ remove_from_kit('BlueScreenView')
+
+ # Download
+ name = 'bluescreenview.zip'
+ url = 'http://www.nirsoft.net/utils/bluescreenview.zip'
+ download_to_temp(name, url)
+
+ name = 'bluescreenview64.zip'
+ url = 'http://www.nirsoft.net/utils/bluescreenview-x64.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_temp_to_cbin('bluescreenview64.zip', 'BlueScreenView', sz_args=['BlueScreenView.exe'])
+ shutil.move(
+ r'{}\BlueScreenView\BlueScreenView.exe'.format(global_vars['CBinDir']),
+ r'{}\BlueScreenView\BlueScreenView64.exe'.format(global_vars['CBinDir']))
+ extract_temp_to_cbin('bluescreenview.zip', 'BlueScreenView')
+
+ # Cleanup
+ remove_from_temp('bluescreenview.zip')
+ remove_from_temp('bluescreenview64.zip')
def update_du():
- pass
+ # Stop running processes
+ kill_process('du.exe')
+ kill_process('du64.exe')
+
+ # Remove existing folders
+ remove_from_kit('Du')
+
+ # Download
+ name = 'du.zip'
+ url = 'https://download.sysinternals.com/files/DU.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_temp_to_cbin('du.zip', 'Du')
+
+ # Cleanup
+ remove_from_temp('du.zip')
def update_erunt():
- pass
+ # Stop running processes
+ kill_process('ERUNT.EXE')
+
+ # Remove existing folders
+ remove_from_kit('ERUNT')
+
+ # Download
+ name = 'erunt.zip'
+ url = 'http://www.aumha.org/downloads/erunt.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_temp_to_cbin('erunt.zip', 'ERUNT')
+
+ # Cleanup
+ remove_from_temp('erunt.zip')
def update_hitmanpro():
- #def download_hitmanpro():
- # path = '{CBinDir}/HitmanPro'.format(**global_vars)
- # name = 'HitmanPro.exe'
- # url = 'http://dl.surfright.nl/HitmanPro.exe'
- # download_to_temp(path, name, url)
- #
- # name = 'HitmanPro64.exe'
- # url = 'http://dl.surfright.nl/HitmanPro_x64.exe'
- # download_to_temp(path, name, url)
- #
- pass
+ # Stop running processes
+ for exe in ['HitmanPro.exe', 'HitmanPro64.exe']:
+ kill_process(exe)
+
+ # Remove existing folders
+ remove_from_kit('HitmanPro')
+
+ # Download
+ dest = r'{}\HitmanPro'.format(global_vars['CBinDir'])
+ name = 'HitmanPro.exe'
+ url = 'https://dl.surfright.nl/HitmanPro.exe'
+ download_generic(dest, name, url)
+
+ name = 'HitmanPro64.exe'
+ url = 'https://dl.surfright.nl/HitmanPro_x64.exe'
+ download_generic(dest, name, url)
+
+def update_hwinfo():
+ ## NOTE: Lives in .bin uncompressed
+ # Stop running processes
+ for exe in ['HWiNFO32.exe', 'HWiNFO64.exe']:
+ kill_process(exe)
+
+ # Download
+ name = 'HWiNFO32.zip'
+ url = 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip'
+ download_to_temp(name, url)
+
+ name = 'HWiNFO64.zip'
+ url = 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip'
+ download_to_temp(name, url)
+
+ # Extract files
+ extract_temp_to_bin('HWiNFO32.zip', 'HWiNFO')
+ extract_temp_to_bin('HWiNFO64.zip', 'HWiNFO')
+
+ # Cleanup
+ remove_from_temp('HWiNFO32.zip')
+ remove_from_temp('HWiNFO64.zip')
def update_produkey():
# Stop running processes
@@ -229,11 +487,11 @@ def update_produkey():
download_to_temp(name, url)
# Extract files
- extract_to_cbin('produkey64.zip', 'ProduKey', 'ProduKey.exe')
+ extract_temp_to_cbin('produkey64.zip', 'ProduKey', sz_args=['ProduKey.exe'])
shutil.move(
r'{}\ProduKey\ProduKey.exe'.format(global_vars['CBinDir']),
r'{}\ProduKey\ProduKey64.exe'.format(global_vars['CBinDir']))
- extract_to_cbin('produkey.zip', 'ProduKey')
+ extract_temp_to_cbin('produkey.zip', 'ProduKey')
# Cleanup
remove_from_temp('produkey.zip')
@@ -241,200 +499,48 @@ def update_produkey():
## Drivers ##
def update_intel_rst():
- pass
+ # Remove existing folders
+ remove_from_kit('Intel RST')
+
+ # Prep
+ dest = r'{}\_Drivers\Intel RST'.format(global_vars['CBinDir'])
+ include_path = r'{}\_include\_Drivers\Intel RST'.format(
+ global_vars['CBinDir'])
+ if os.path.exists(include_path):
+ shutil.copytree(include_path, dest)
+
+ # Download
+ for name, url in RST_FILES.items():
+ download_generic(dest, name, url)
def update_intel_ssd_toolbox():
- #def update_intel_ssd_toolbox():
- # path = '{BinDir}/_Drivers'.format(**global_vars)
- # name = 'Intel SSD Toolbox.exe'
- # _dl_page = 'https://downloadcenter.intel.com/download/26085/Intel-Solid-State-Drive-Toolbox'
- # _regex = r'href=./downloads/eula/[0-9]+/Intel-Solid-State-Drive-Toolbox.httpDown=https\%3A\%2F\%2Fdownloadmirror\.intel\.com\%2F[0-9]+\%2Feng\%2FIntel\%20SSD\%20Toolbox\%20-\%20v[0-9\.]+.exe'
- # url = resolve_dynamic_url(_dl_page, _regex)
- # url = re.sub(r'.*httpDown=(.*)', r'\1', url, re.IGNORECASE)
- # url = url.replace('%3A', ':')
- # url = url.replace('%2F', '/')
- # download_to_temp(path, name, url)
- pass
+ # Remove existing folders
+ remove_from_kit('Intel SSD Toolbox.exe')
+
+ # Download
+ dest = r'{}\_Drivers'.format(global_vars['CBinDir'])
+ name = 'Intel SSD Toolbox.exe'
+ url = r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe'
+ download_generic(dest, name, url)
-def update_samsing_magician():
- #def update_samsung_magician():
- # print_warning('Disabled.')
- # #~Broken~# path = '{BinDir}/_Drivers'.format(**global_vars)
- # #~Broken~# name = 'Samsung Magician.zip'
- # #~Broken~# _dl_page = 'http://www.samsung.com/semiconductor/minisite/ssd/download/tools.html'
- # #~Broken~# _regex = r'href=./semiconductor/minisite/ssd/downloads/software/Samsung_Magician_Setup_v[0-9]+.zip'
- # #~Broken~# url = resolve_dynamic_url(_dl_page, _regex)
- # #~Broken~# # Convert relative url to absolute
- # #~Broken~# url = 'http://www.samsung.com' + url
- # #~Broken~# download_to_temp(path, name, url)
- # #~Broken~# # Extract and replace old copy
- # #~Broken~# _args = [
- # #~Broken~# 'e', '"{BinDir}/_Drivers/Samsung Magician.zip"'.format(**global_vars),
- # #~Broken~# '-aoa', '-bso0', '-bsp0',
- # #~Broken~# '-o"{BinDir}/_Drivers"'.format(**global_vars)
- # #~Broken~# ]
- # #~Broken~# run_program(seven_zip, _args)
- # #~Broken~# try:
- # #~Broken~# os.remove('{BinDir}/_Drivers/Samsung Magician.zip'.format(**global_vars))
- # #~Broken~# #~PoSH~# Move-Item "$bin\_Drivers\Samsung*exe" "$bin\_Drivers\Samsung Magician.exe" $path 2>&1 | Out-Null
- # #~Broken~# except Exception:
- # #~Broken~# pass
- # pass
- pass
+def update_samsung_magician():
+ # Remove existing folders
+ remove_from_kit('Samsung Magician.exe')
+
+ # Download
+ dest = r'{}\_Drivers'.format(global_vars['CBinDir'])
+ name = 'Samsung Magician.exe'
+ url = 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe'
+ download_generic(dest, name, url)
def update_sdi():
+ #TODO
pass
## Installers ##
-def update_adobe_reader():
+def update_adobe_reader_dc():
pass
-def update_ninite():
- # Ninite - Bundles
- # print_info('Installers')
- # print_success(' '*4 + 'Ninite Bundles')
- # _path = r'{BaseDir}\Installers\Extras\Bundles'.format(**global_vars)
- # try_and_print(message='Runtimes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Runtimes.exe', source_url='https://ninite.com/.net4.7-air-java8-silverlight/ninite.exe')
- # try_and_print(message='Legacy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Legacy.exe', source_url='https://ninite.com/.net4.7-7zip-air-chrome-firefox-java8-silverlight-vlc/ninite.exe')
- # try_and_print(message='Modern.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Modern.exe', source_url='https://ninite.com/.net4.7-7zip-air-chrome-classicstart-firefox-java8-silverlight-vlc/ninite.exe')
-
- # # Ninite - Audio-Video
- # print_success(' '*4 + 'Audio-Video')
- # _path = r'{BaseDir}\Installers\Extras\Audio-Video'.format(**global_vars)
- # try_and_print(message='AIMP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='AIMP.exe', source_url='https://ninite.com/aimp/ninite.exe')
- # try_and_print(message='Audacity.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Audacity.exe', source_url='https://ninite.com/audacity/ninite.exe')
- # try_and_print(message='CCCP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CCCP.exe', source_url='https://ninite.com/cccp/ninite.exe')
- # try_and_print(message='Foobar2000.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Foobar2000.exe', source_url='https://ninite.com/foobar/ninite.exe')
- # try_and_print(message='GOM.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='GOM.exe', source_url='https://ninite.com/gom/ninite.exe')
- # try_and_print(message='iTunes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='HandBrake.exe', source_url='https://ninite.com/handbrake/ninite.exe')
- # try_and_print(message='iTunes.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='iTunes.exe', source_url='https://ninite.com/itunes/ninite.exe')
- # try_and_print(message='K-Lite Codecs.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='K-Lite Codecs.exe', source_url='https://ninite.com/klitecodecs/ninite.exe')
- # try_and_print(message='MediaMonkey.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='MediaMonkey.exe', source_url='https://ninite.com/mediamonkey/ninite.exe')
- # try_and_print(message='MusicBee.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='MusicBee.exe', source_url='https://ninite.com/musicbee/ninite.exe')
- # try_and_print(message='Spotify.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Spotify.exe', source_url='https://ninite.com/spotify/ninite.exe')
- # try_and_print(message='VLC.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='VLC.exe', source_url='https://ninite.com/vlc/ninite.exe')
- # try_and_print(message='Winamp.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Winamp.exe', source_url='https://ninite.com/winamp/ninite.exe')
-
- # # Ninite - Cloud Storage
- # print_success(' '*4 + 'Cloud Storage')
- # _path = r'{BaseDir}\Installers\Extras\Cloud Storage'.format(**global_vars)
- # try_and_print(message='Dropbox.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Dropbox.exe', source_url='https://ninite.com/dropbox/ninite.exe')
- # try_and_print(message='Google Backup & Sync.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Backup & Sync.exe', source_url='https://ninite.com/googlebackupandsync/ninite.exe')
- # try_and_print(message='Mozy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Mozy.exe', source_url='https://ninite.com/mozy/ninite.exe')
- # try_and_print(message='OneDrive.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='OneDrive.exe', source_url='https://ninite.com/onedrive/ninite.exe')
- # try_and_print(message='SugarSync.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SugarSync.exe', source_url='https://ninite.com/sugarsync/ninite.exe')
-
- # # Ninite - Communication
- # print_success(' '*4 + 'Communication')
- # _path = r'{BaseDir}\Installers\Extras\Communication'.format(**global_vars)
- # try_and_print(message='Pidgin.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Pidgin.exe', source_url='https://ninite.com/pidgin/ninite.exe')
- # try_and_print(message='Skype.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Skype.exe', source_url='https://ninite.com/skype/ninite.exe')
- # try_and_print(message='Trillian.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Trillian.exe', source_url='https://ninite.com/trillian/ninite.exe')
-
- # # Ninite - Compression
- # print_success(' '*4 + 'Compression')
- # _path = r'{BaseDir}\Installers\Extras\Compression'.format(**global_vars)
- # try_and_print(message='7-Zip.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='7-Zip.exe', source_url='https://ninite.com/7zip/ninite.exe')
- # try_and_print(message='PeaZip.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PeaZip.exe', source_url='https://ninite.com/peazip/ninite.exe')
- # try_and_print(message='WinRAR.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinRAR.exe', source_url='https://ninite.com/winrar/ninite.exe')
-
- # # Ninite - Developer
- # print_success(' '*4 + 'Developer')
- # _path = r'{BaseDir}\Installers\Extras\Developer'.format(**global_vars)
- # try_and_print(message='Eclipse.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Eclipse.exe', source_url='https://ninite.com/eclipse/ninite.exe')
- # try_and_print(message='FileZilla.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='FileZilla.exe', source_url='https://ninite.com/filezilla/ninite.exe')
- # try_and_print(message='JDK 8.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='JDK 8.exe', source_url='https://ninite.com/jdk8/ninite.exe')
- # try_and_print(message='JDK 8 (x64).exe', function=download_file, other_results=other_results, out_dir=_path, out_name='JDK 8 (x64).exe', source_url='https://ninite.com/jdkx8/ninite.exe')
- # try_and_print(message='Notepad++.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Notepad++.exe', source_url='https://ninite.com/notepadplusplus/ninite.exe')
- # try_and_print(message='PuTTY.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PuTTY.exe', source_url='https://ninite.com/putty/ninite.exe')
- # try_and_print(message='Python 2.7.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Python 2.exe', source_url='https://ninite.com/python/ninite.exe')
- # try_and_print(message='Visual Studio Code.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Visual Studio Code.exe', source_url='https://ninite.com/vscode/ninite.exe')
- # try_and_print(message='WinMerge.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinMerge.exe', source_url='https://ninite.com/winmerge/ninite.exe')
- # try_and_print(message='WinSCP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinSCP.exe', source_url='https://ninite.com/winscp/ninite.exe')
-
- # # Ninite - File Sharing
- # print_success(' '*4 + 'File Sharing')
- # _path = r'{BaseDir}\Installers\Extras\File Sharing'.format(**global_vars)
- # try_and_print(message='qBittorrent.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='qBittorrent.exe', source_url='https://ninite.com/qbittorrent/ninite.exe')
-
- # # Ninite - Image-Photo
- # print_success(' '*4 + 'Image-Photo')
- # _path = r'{BaseDir}\Installers\Extras\Image-Photo'.format(**global_vars)
- # try_and_print(message='Blender.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Blender.exe', source_url='https://ninite.com/blender/ninite.exe')
- # try_and_print(message='FastStone.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='FastStone.exe', source_url='https://ninite.com/faststone/ninite.exe')
- # try_and_print(message='GIMP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='GIMP.exe', source_url='https://ninite.com/gimp/ninite.exe')
- # try_and_print(message='Greenshot.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Greenshot.exe', source_url='https://ninite.com/greenshot/ninite.exe')
- # try_and_print(message='Inkscape.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Inkscape.exe', source_url='https://ninite.com/inkscape/ninite.exe')
- # try_and_print(message='IrfanView.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='IrfanView.exe', source_url='https://ninite.com/irfanview/ninite.exe')
- # try_and_print(message='Krita.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Krita.exe', source_url='https://ninite.com/krita/ninite.exe')
- # try_and_print(message='Paint.NET.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Paint.NET.exe', source_url='https://ninite.com/paint.net/ninite.exe')
- # try_and_print(message='ShareX.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='ShareX.exe', source_url='https://ninite.com/sharex/ninite.exe')
- # try_and_print(message='XnView.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='XnView.exe', source_url='https://ninite.com/xnview/ninite.exe')
-
- # # Ninite - Misc
- # print_success(' '*4 + 'Misc')
- # _path = r'{BaseDir}\Installers\Extras\Misc'.format(**global_vars)
- # try_and_print(message='Evernote.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Evernote.exe', source_url='https://ninite.com/evernote/ninite.exe')
- # try_and_print(message='Everything.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Everything.exe', source_url='https://ninite.com/everything/ninite.exe')
- # try_and_print(message='KeePass 2.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='KeePass 2.exe', source_url='https://ninite.com/keepass2/ninite.exe')
- # try_and_print(message='Google Earth.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Earth.exe', source_url='https://ninite.com/googleearth/ninite.exe')
- # try_and_print(message='NV Access.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='NV Access.exe', source_url='https://ninite.com/nvda/ninite.exe')
- # try_and_print(message='Steam.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Steam.exe', source_url='https://ninite.com/steam/ninite.exe')
-
- # # Ninite - Office
- # print_success(' '*4 + 'Office')
- # _path = r'{BaseDir}\Installers\Extras\Office'.format(**global_vars)
- # try_and_print(message='CutePDF.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CutePDF.exe', source_url='https://ninite.com/cutepdf/ninite.exe')
- # try_and_print(message='Foxit Reader.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Foxit Reader.exe', source_url='https://ninite.com/foxit/ninite.exe')
- # try_and_print(message='LibreOffice.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='LibreOffice.exe', source_url='https://ninite.com/libreoffice/ninite.exe')
- # try_and_print(message='OpenOffice.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='OpenOffice.exe', source_url='https://ninite.com/openoffice/ninite.exe')
- # try_and_print(message='PDFCreator.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='PDFCreator.exe', source_url='https://ninite.com/pdfcreator/ninite.exe')
- # try_and_print(message='SumatraPDF.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SumatraPDF.exe', source_url='https://ninite.com/sumatrapdf/ninite.exe')
- # try_and_print(message='Thunderbird.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Thunderbird.exe', source_url='https://ninite.com/thunderbird/ninite.exe')
-
- # # Ninite - Runtimes
- # print_success(' '*4 + 'Runtimes')
- # _path = r'{BaseDir}\Installers\Extras\Runtimes'.format(**global_vars)
- # try_and_print(message='Adobe Air.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Adobe Air.exe', source_url='https://ninite.com/air/ninite.exe')
- # try_and_print(message='dotNET.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='dotNET.exe', source_url='https://ninite.com/.net4.7/ninite.exe')
- # try_and_print(message='Java 8.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Java 8.exe', source_url='https://ninite.com/java8/ninite.exe')
- # try_and_print(message='Shockwave.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Shockwave.exe', source_url='https://ninite.com/shockwave/ninite.exe')
- # try_and_print(message='Silverlight.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Silverlight.exe', source_url='https://ninite.com/silverlight/ninite.exe')
-
- # # Ninite - Security
- # print_success(' '*4 + 'Security')
- # _path = r'{BaseDir}\Installers\Extras\Security'.format(**global_vars)
- # try_and_print(message='Avast.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Avast.exe', source_url='https://ninite.com/avast/ninite.exe')
- # try_and_print(message='AVG.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='AVG.exe', source_url='https://ninite.com/avg/ninite.exe')
- # try_and_print(message='Avira.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Avira.exe', source_url='https://ninite.com/avira/ninite.exe')
- # try_and_print(message='Microsoft Security Essentials.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Microsoft Security Essentials.exe', source_url='https://ninite.com/essentials/ninite.exe')
- # try_and_print(message='Malwarebytes Anti-Malware.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Malwarebytes Anti-Malware.exe', source_url='https://ninite.com/malwarebytes/ninite.exe')
- # try_and_print(message='Spybot 2.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Spybot 2.exe', source_url='https://ninite.com/spybot2/ninite.exe')
- # try_and_print(message='SUPERAntiSpyware.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='SUPERAntiSpyware.exe', source_url='https://ninite.com/super/ninite.exe')
-
- # # Ninite - Utilities
- # print_success(' '*4 + 'Utilities')
- # _path = r'{BaseDir}\Installers\Extras\Utilities'.format(**global_vars)
- # try_and_print(message='CDBurnerXP.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='CDBurnerXP.exe', source_url='https://ninite.com/cdburnerxp/ninite.exe')
- # try_and_print(message='Classic Start.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Classic Start.exe', source_url='https://ninite.com/classicstart/ninite.exe')
- # try_and_print(message='Glary Utilities.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Glary Utilities.exe', source_url='https://ninite.com/glary/ninite.exe')
- # try_and_print(message='ImgBurn.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='ImgBurn.exe', source_url='https://ninite.com/imgburn/ninite.exe')
- # try_and_print(message='InfraRecorder.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='InfraRecorder.exe', source_url='https://ninite.com/infrarecorder/ninite.exe')
- # try_and_print(message='Launchy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Launchy.exe', source_url='https://ninite.com/launchy/ninite.exe')
- # try_and_print(message='RealVNC.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='RealVNC.exe', source_url='https://ninite.com/realvnc/ninite.exe')
- # try_and_print(message='Revo Uninstaller.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Revo Uninstaller.exe', source_url='https://ninite.com/revo/ninite.exe')
- # try_and_print(message='TeamViewer 12.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='TeamViewer 12.exe', source_url='https://ninite.com/teamviewer12/ninite.exe')
- # try_and_print(message='TeraCopy.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='TeraCopy.exe', source_url='https://ninite.com/teracopy/ninite.exe')
- # try_and_print(message='WinDirStat.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='WinDirStat.exe', source_url='https://ninite.com/windirstat/ninite.exe')
-
- # # Ninite - Web Browsers
- # print_success(' '*4 + 'Web Browsers')
- # _path = r'{BaseDir}\Installers\Extras\Web Browsers'.format(**global_vars)
- # try_and_print(message='Google Chrome.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Google Chrome.exe', source_url='https://ninite.com/chrome/ninite.exe')
- # try_and_print(message='Mozilla Firefox.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Mozilla Firefox.exe', source_url='https://ninite.com/firefox/ninite.exe')
- # try_and_print(message='Opera Chromium.exe', function=download_file, other_results=other_results, out_dir=_path, out_name='Opera Chromium.exe', source_url='https://ninite.com/operaChromium/ninite.exe')
- pass
-
## Misc ##
def update_everything():
pass
@@ -452,7 +558,11 @@ def update_notepadplusplus():
download_to_temp(name, url)
# Extract files
- extract_to_cbin('npp.7z', 'NotepadPlusPlus')
+ extract_temp_to_cbin('npp.7z', 'NotepadPlusPlus')
+ shutil.move(
+ r'{}\NotepadPlusPlus\notepad++.exe'.format(global_vars['CBinDir']),
+ r'{}\NotepadPlusPlus\notepadplusplus.exe'.format(global_vars['CBinDir'])
+ )
# Cleanup
remove_from_temp('npp.7z')
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index ed9d9e0a..71cec02b 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -48,13 +48,21 @@ if __name__ == '__main__':
print_info('\nDrivers')
try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results)
try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results)
- try_and_print(message='Samsing Magician...', function=update_samsing_magician, other_results=other_results)
+ try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results)
try_and_print(message='Snappy Driver Installer...', function=update_sdi, other_results=other_results)
# Installers
print_info('\nInstallers')
try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results)
- try_and_print(message='Ninite Installers...', function=update_ninite, other_results=other_results)
+ print_info('\nNinite')
+ for section in sorted(NINITE_FILES.keys()):
+ print_success(' {}'.format(section))
+ dest = r'{}\_Ninite\{}'.format(global_vars['CBinDir'], section)
+ for name, url in sorted(NINITE_FILES[section].items()):
+ url = 'https://ninite.com/{}/ninite.exe'.format(url)
+ try_and_print(message=name, function=download_generic,
+ other_results=other_results,
+ out_dir=dest, out_name=name, source_url=url)
# Misc
print_info('\nMisc')
diff --git a/.cbin/_include/BleachBit-Portable/BleachBit.ini b/.cbin/_include/BleachBit-Portable/BleachBit.ini
new file mode 100644
index 00000000..6a3b2c87
--- /dev/null
+++ b/.cbin/_include/BleachBit-Portable/BleachBit.ini
@@ -0,0 +1,77 @@
+[Portable]
+
+[bleachbit]
+auto_hide = False
+auto_start = False
+check_beta = False
+check_online_updates = False
+shred = False
+exit_done = False
+delete_confirmation = True
+units_iec = True
+update_winapp2 = False
+first_start = True
+version = 1.17
+
+[hashpath]
+
+[list/shred_drives]
+
+[preserve_languages]
+en = True
+
+[tree]
+adobe_reader = True
+adobe_reader.cache = True
+adobe_reader.tmp = True
+amule = True
+amule.tmp = True
+chromium = True
+chromium.cache = True
+firefox = True
+firefox.cache = True
+gimp = True
+gimp.tmp = True
+google_chrome = True
+google_chrome.cache = True
+google_earth = True
+google_earth.temporary_files = True
+hippo_opensim_viewer = True
+hippo_opensim_viewer.cache = True
+internet_explorer = True
+internet_explorer.temporary_files = True
+java = True
+java.cache = True
+libreoffice = True
+libreoffice.cache = True
+liferea = True
+liferea.cache = True
+miro = True
+miro.cache = True
+openofficeorg = True
+openofficeorg.cache = True
+opera = True
+opera.cache = True
+pidgin = True
+pidgin.cache = True
+safari = True
+safari.cache = True
+seamonkey = True
+seamonkey.cache = True
+secondlife_viewer = True
+secondlife_viewer.Cache = True
+system = True
+system.recycle_bin = True
+system.tmp = True
+thunderbird = True
+thunderbird.cache = True
+vuze = True
+vuze.cache = True
+vuze.tmp = True
+yahoo_messenger = True
+yahoo_messenger.cache = True
+winapp2_windows = True
+winapp2_windows.cbs_logs = True
+winapp2_windows.cbs_logs_more = True
+winapp2_windows.windows_cbs_logs_more = True
+
diff --git a/.cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt b/.cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt
new file mode 100644
index 00000000..4f6d46da
--- /dev/null
+++ b/.cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt
@@ -0,0 +1 @@
+Broken. "requires" .NET 4.5 but fails to accept .NET 4.6 or newer (which we install).
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index abb51302..b619bc53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,11 @@
.bin/Tmp/
.bin/XMPlay/
.cbin/AIDA64/
+.cbin/Autoruns/
+.cbin/BleachBit-Portable/
+.cbin/BlueScreenView/
+.cbin/Du/
.cbin/ProduKey/
.cbin/TestDisk/
.cbin/XYplorerFree/
+.cbin/_Drivers/
From 5c5fba103e4408654fbddd6e234400ed93c12d44 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Mon, 20 Nov 2017 21:23:41 -0800
Subject: [PATCH 05/20] Downloads finished
Testing and compression next
---
.bin/Scripts/build_kit.ps1 | 2 +-
.bin/Scripts/functions/common.py | 51 +--
.bin/Scripts/functions/update.py | 568 +++++++++++++++-------------
.bin/Scripts/settings/launchers.py | 8 +-
.bin/Scripts/settings/music.py | 70 ++++
.bin/Scripts/settings/sources.py | 173 +++++++++
.bin/Scripts/settings/tools.py | 55 +++
.bin/Scripts/update_kit.py | 6 +-
.bin/{SDI => _Drivers/SDIO}/sdi.cfg | 3 +-
.cbin/_include/XMPlay/xmplay.ini | 139 +++++++
.gitignore | 5 +
11 files changed, 750 insertions(+), 330 deletions(-)
create mode 100644 .bin/Scripts/settings/music.py
create mode 100644 .bin/Scripts/settings/sources.py
create mode 100644 .bin/Scripts/settings/tools.py
rename .bin/{SDI => _Drivers/SDIO}/sdi.cfg (79%)
create mode 100644 .cbin/_include/XMPlay/xmplay.ini
diff --git a/.bin/Scripts/build_kit.ps1 b/.bin/Scripts/build_kit.ps1
index 2d54a413..75d9bff2 100644
--- a/.bin/Scripts/build_kit.ps1
+++ b/.bin/Scripts/build_kit.ps1
@@ -177,5 +177,5 @@ popd
if ($errors -gt 0) {
wk_pause "Press Enter to exit..."
} else {
- start "$bin\ConEmu\ConEmu.exe" -argumentlist @("-run", "$bin\Python\x32\python.exe", "$bin\Scripts\update_kit.py")
+ start "$bin\ConEmu\ConEmu.exe" -argumentlist @("-run", "$bin\Python\x32\python.exe", "$bin\Scripts\update_kit.py", "-new_console:c")
}
diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py
index a204fef5..4fb57739 100644
--- a/.bin/Scripts/functions/common.py
+++ b/.bin/Scripts/functions/common.py
@@ -13,6 +13,7 @@ import winreg
from subprocess import CalledProcessError
from settings.main import *
+from settings.tools import *
# Global variables
global_vars = {}
@@ -28,56 +29,6 @@ COLORS = {
HKU = winreg.HKEY_USERS
HKCU = winreg.HKEY_CURRENT_USER
HKLM = winreg.HKEY_LOCAL_MACHINE
-TOOLS = {
- # NOTE: BinDir will be prepended to these paths at runtime
- 'AIDA64': {
- '32': r'AIDA64\aida64.exe'},
- 'AutoRuns': {
- '32': r'Autoruns\autoruns.exe',
- '64': r'Autoruns\autoruns64.exe'},
- 'BleachBit': {
- '32': r'BleachBit-Portable\bleachbit_console.exe'},
- 'Caffeine': {
- '32': r'Caffeine\caffeine.exe'},
- 'Du': {
- '32': r'Du\du.exe',
- '64': r'Du\du64.exe'},
- 'ERUNT': {
- '32': r'ERUNT\ERUNT.EXE'},
- 'Everything': {
- '32': r'Everything\Everything.exe',
- '64': r'Everything\Everything64.exe'},
- 'FastCopy': {
- '32': r'FastCopy\FastCopy.exe',
- '64': r'FastCopy\FastCopy64.exe'},
- 'HitmanPro': {
- '32': r'HitmanPro\HitmanPro.exe',
- '64': r'HitmanPro\HitmanPro64.exe'},
- 'HWiNFO': {
- '32': r'HWiNFO\HWiNFO.exe',
- '64': r'HWiNFO\HWiNFO64.exe'},
- 'KVRT': {
- '32': r'KVRT\KVRT.exe'},
- 'NotepadPlusPlus': {
- '32': r'NotepadPlusPlus\notepadplusplus.exe'},
- 'ProduKey': {
- '32': r'ProduKey\ProduKey.exe',
- '64': r'ProduKey\ProduKey64.exe'},
- 'PuTTY-PSFTP': {
- '32': r'PuTTY\PSFTP.EXE'},
- 'RKill': {
- '32': r'RKill\RKill.exe'},
- 'SevenZip': {
- '32': r'7-Zip\7za.exe',
- '64': r'7-Zip\7za64.exe'},
- 'TDSSKiller': {
- '32': r'TDSSKiller\TDSSKiller.exe'},
- 'wimlib-imagex': {
- '32': r'wimlib\x32\wimlib-imagex.exe',
- '64': r'wimlib\x64\wimlib-imagex.exe'},
- 'XMPlay': {
- '32': r'XMPlay\xmplay.exe'},
-}
# Error Classes
class BinNotFoundError(Exception):
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index a5c39450..4a34f633 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -5,134 +5,8 @@ import requests
from functions.common import *
from settings.launchers import *
-
-NINITE_FILES = {
- 'Bundles': {
- 'Runtimes.exe': '.net4.7-air-java8-silverlight',
- 'Legacy.exe': '.net4.7-7zip-air-chrome-firefox-java8-silverlight-vlc',
- 'Modern.exe': '.net4.7-7zip-air-chrome-classicstart-firefox-java8-silverlight-vlc',
- },
- 'Audio-Video': {
- 'AIMP.exe': 'aimp',
- 'Audacity.exe': 'audacity',
- 'CCCP.exe': 'cccp',
- 'Foobar2000.exe': 'foobar',
- 'GOM.exe': 'gom',
- 'HandBrake.exe': 'handbrake',
- 'iTunes.exe': 'itunes',
- 'K-Lite Codecs.exe': 'klitecodecs',
- 'MediaMonkey.exe': 'mediamonkey',
- 'MusicBee.exe': 'musicbee',
- 'Spotify.exe': 'spotify',
- 'VLC.exe': 'vlc',
- 'Winamp.exe': 'winamp',
- },
- 'Cloud Storage': {
- 'Dropbox.exe': 'dropbox',
- 'Google Backup & Sync.exe': 'googlebackupandsync',
- 'Mozy.exe': 'mozy',
- 'OneDrive.exe': 'onedrive',
- 'SugarSync.exe': 'sugarsync',
- },
- 'Communication': {
- 'Pidgin.exe': 'pidgin',
- 'Skype.exe': 'skype',
- 'Trillian.exe': 'trillian',
- },
- 'Compression': {
- '7-Zip.exe': '7zip',
- 'PeaZip.exe': 'peazip',
- 'WinRAR.exe': 'winrar',
- },
- 'Developer': {
- 'Eclipse.exe': 'eclipse',
- 'FileZilla.exe': 'filezilla',
- 'JDK 8.exe': 'jdk8',
- 'JDK 8 (x64).exe': 'jdkx8',
- 'Notepad++.exe': 'notepadplusplus',
- 'PuTTY.exe': 'putty',
- 'Python 2.exe': 'python',
- 'Visual Studio Code.exe': 'vscode',
- 'WinMerge.exe': 'winmerge',
- 'WinSCP.exe': 'winscp',
- },
- 'File Sharing': {
- 'qBittorrent.exe': 'qbittorrent',
- },
- 'Image-Photo': {
- 'Blender.exe': 'blender',
- 'FastStone.exe': 'faststone',
- 'GIMP.exe': 'gimp',
- 'Greenshot.exe': 'greenshot',
- 'Inkscape.exe': 'inkscape',
- 'IrfanView.exe': 'irfanview',
- 'Krita.exe': 'krita',
- 'Paint.NET.exe': 'paint.net',
- 'ShareX.exe': 'sharex',
- 'XnView.exe': 'xnview',
- },
- 'Misc': {
- 'Evernote.exe': 'evernote',
- 'Everything.exe': 'everything',
- 'KeePass 2.exe': 'keepass2',
- 'Google Earth.exe': 'googleearth',
- 'NV Access.exe': 'nvda',
- 'Steam.exe': 'steam',
- },
- 'Office': {
- 'CutePDF.exe': 'cutepdf',
- 'Foxit Reader.exe': 'foxit',
- 'LibreOffice.exe': 'libreoffice',
- 'OpenOffice.exe': 'openoffice',
- 'PDFCreator.exe': 'pdfcreator',
- 'SumatraPDF.exe': 'sumatrapdf',
- 'Thunderbird.exe': 'thunderbird',
- },
- 'Runtimes': {
- 'Adobe Air.exe': 'air',
- 'dotNET.exe': '.net4.7',
- 'Java 8.exe': 'java8',
- 'Shockwave.exe': 'shockwave',
- 'Silverlight.exe': 'silverlight',
- },
- 'Security': {
- 'Avast.exe': 'avast',
- 'AVG.exe': 'avg',
- 'Avira.exe': 'avira',
- 'Microsoft Security Essentials.exe': 'essentials',
- 'Malwarebytes Anti-Malware.exe': 'malwarebytes',
- 'Spybot 2.exe': 'spybot2',
- 'SUPERAntiSpyware.exe': 'super',
- },
- 'Utilities': {
- 'CDBurnerXP.exe': 'cdburnerxp',
- 'Classic Start.exe': 'classicstart',
- 'Glary Utilities.exe': 'glary',
- 'ImgBurn.exe': 'imgburn',
- 'InfraRecorder.exe': 'infrarecorder',
- 'Launchy.exe': 'launchy',
- 'RealVNC.exe': 'realvnc',
- 'Revo Uninstaller.exe': 'revo',
- 'TeamViewer 12.exe': 'teamviewer12',
- 'TeraCopy.exe': 'teracopy',
- 'WinDirStat.exe': 'windirstat',
- },
- 'Web Browsers': {
- 'Google Chrome.exe': 'chrome',
- 'Mozilla Firefox.exe': 'firefox',
- 'Opera Chromium.exe': 'operaChromium',
- },
- }
-RST_FILES = {
- #SetupRST_12.0.exe : Removed from download center?
- #SetupRST_12.5.exe : Removed from download center?
- #SetupRST_12.8.exe : Removed from download center?
- 'SetupRST_12.9.exe': 'https://downloadmirror.intel.com/23496/eng/SetupRST.exe',
- #SetupRST_13.x.exe : Broken, doesn't support > .NET 4.5
- 'SetupRST_14.0.exe': 'https://downloadmirror.intel.com/25091/eng/SetupRST.exe',
- 'SetupRST_14.8.exe': 'https://downloadmirror.intel.com/26759/eng/setuprst.exe',
- 'SetupRST_15.8.exe': 'https://downloadmirror.intel.com/27147/eng/SetupRST.exe',
- }
+from settings.music import *
+from settings.sources import *
def download_generic(out_dir, out_name, source_url):
"""Downloads a file using requests."""
@@ -154,29 +28,6 @@ def download_generic(out_dir, out_name, source_url):
def download_to_temp(out_name, source_url):
download_generic(global_vars['TmpDir'], out_name, source_url)
-def resolve_dynamic_url(source_url, regex, tmp_file='webpage.tmp'):
- """Scan source_url for a url using the regex provided; returns str."""
- # Download the "download page"
- try:
- download_to_temp('webpage.tmp', source_url)
- except Exception:
- # "Fail silently as the download_to_temp() function will catch it
- return None
-
- # Scan the file for the regex
- tmp_file = r'{}\{}'.format(global_vars['TmpDir'], tmp_file)
- with open(tmp_file, 'r') as file:
- for line in file:
- if re.search(regex, line):
- url = line.strip()
- url = re.sub(r'.*(a |)href="([^"]+)".*', r'\2', url)
- url = re.sub(r".*(a |)href='([^']+)'.*", r'\2', url)
- break
-
- # Cleanup and return
- os.remove(tmp_file)
- return url
-
def extract_generic(source, dest, mode='x', sz_args=[]):
cmd = [
global_vars['Tools']['SevenZip'],
@@ -199,20 +50,45 @@ def extract_temp_to_cbin(source, item, mode='x', sz_args=[]):
shutil.copytree(include_path, dest)
extract_generic(source, dest, mode, sz_args)
+def remove_item(item_path):
+ if os.path.exists(item_path):
+ if os.path.isdir(item_path):
+ shutil.rmtree(item_path, ignore_errors=True)
+ else:
+ os.remove(item_path)
+
def remove_from_kit(item):
item_locations = []
for p in [global_vars['BinDir'], global_vars['CBinDir']]:
item_locations.append(r'{}\{}'.format(p, item))
item_locations.append(r'{}\_Drivers\{}'.format(p, item))
for item_path in item_locations:
- if os.path.exists(item_path):
- if os.path.isdir(item_path):
- shutil.rmtree(item_path, ignore_errors=True)
- else:
- os.remove(item_path)
+ remove_item(item_path)
def remove_from_temp(item):
- os.remove(r'{}\{}'.format(global_vars['TmpDir'], item))
+ item_path = r'{}\{}'.format(global_vars['TmpDir'], item)
+ remove_item(item_path)
+
+def resolve_dynamic_url(source_url, regex):
+ """Scan source_url for a url using the regex provided; returns str."""
+ # Load the download page
+ try:
+ download_page = requests.get(source_url)
+ except Exception:
+ # "Fail silently as the download_to_temp() function will catch it
+ return None
+
+ # Scan for the url using the regex provided
+ url = None
+ for line in download_page.content.decode().splitlines():
+ if re.search(regex, line):
+ url = line.strip()
+ url = re.sub(r'.*(a |)href="([^"]+)".*', r'\2', url)
+ url = re.sub(r".*(a |)href='([^']+)'.*", r'\2', url)
+ break
+
+ # Return
+ return url
## Data Recovery ##
def update_testdisk():
@@ -225,9 +101,7 @@ def update_testdisk():
remove_from_kit('TestDisk')
# Download
- name = 'testdisk_wip.zip'
- url = 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip'
- download_to_temp(name, url)
+ download_to_temp('testdisk_wip.zip', SOURCE_URLS['TestDisk'])
# Extract files
extract_temp_to_cbin('testdisk_wip.zip', 'TestDisk')
@@ -253,13 +127,8 @@ def update_fastcopy():
remove_from_kit('FastCopy')
# Download
- name = 'FastCopy32.zip'
- url = 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip'
- download_to_temp(name, url)
-
- name = 'FastCopy64.zip'
- url = 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip'
- download_to_temp(name, url)
+ download_to_temp('FastCopy32.zip', SOURCE_URLS['FastCopy32'])
+ download_to_temp('FastCopy64.zip', SOURCE_URLS['FastCopy64'])
# Extract
extract_temp_to_bin('FastCopy64.zip', 'FastCopy', sz_args=['FastCopy.exe'])
@@ -280,9 +149,7 @@ def update_xyplorer():
remove_from_kit('XYplorerFree')
# Download
- name = 'xyplorer_free.zip'
- url = 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip'
- download_to_temp(name, url)
+ download_to_temp('xyplorer_free.zip', SOURCE_URLS['XYplorerFree'])
# Extract files
extract_temp_to_cbin('xyplorer_free.zip', 'XYplorerFree')
@@ -299,9 +166,7 @@ def update_aida64():
remove_from_kit('AIDA64')
# Download
- name = 'aida64.zip'
- url = 'http://download.aida64.com/aida64engineer592.zip'
- download_to_temp(name, url)
+ download_to_temp('aida64.zip', SOURCE_URLS['AIDA64'])
# Extract files
extract_temp_to_cbin('aida64.zip', 'AIDA64')
@@ -318,9 +183,7 @@ def update_autoruns():
remove_from_kit('Autoruns')
# Download
- name = 'Autoruns.zip'
- url = 'https://download.sysinternals.com/files/Autoruns.zip'
- download_to_temp(name, url)
+ download_to_temp('Autoruns.zip', SOURCE_URLS['Autoruns'])
# Extract files
extract_temp_to_cbin('Autoruns.zip', 'Autoruns')
@@ -336,15 +199,11 @@ def update_bleachbit():
remove_from_kit('BleachBit-Portable')
# Download
- name = 'BleachBit-Portable.zip'
- url = 'https://download.bleachbit.org/beta/1.17/BleachBit-1.17-portable.zip'
- download_to_temp(name, url)
- name = 'Winapp2.zip'
- url = 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip'
- download_to_temp(name, url)
+ download_to_temp('bleachbit.zip', SOURCE_URLS['BleachBit'])
+ download_to_temp('Winapp2.zip', SOURCE_URLS['Winapp2'])
# Extract files
- extract_temp_to_cbin('BleachBit-Portable.zip', 'BleachBit-Portable')
+ extract_temp_to_cbin('bleachbit.zip', 'BleachBit-Portable')
extract_generic(
r'{}\Winapp2.zip'.format(global_vars['TmpDir']),
r'{}\BleachBit-Portable\cleaners'.format(global_vars['CBinDir']),
@@ -360,7 +219,7 @@ def update_bleachbit():
r'{}\BleachBit-Portable\BleachBit-Portable'.format(global_vars['CBinDir']))
# Cleanup
- remove_from_temp('BleachBit-Portable.zip')
+ remove_from_temp('bleachbit.zip')
remove_from_temp('Winapp2.zip')
def update_bluescreenview():
@@ -372,23 +231,18 @@ def update_bluescreenview():
remove_from_kit('BlueScreenView')
# Download
- name = 'bluescreenview.zip'
- url = 'http://www.nirsoft.net/utils/bluescreenview.zip'
- download_to_temp(name, url)
-
- name = 'bluescreenview64.zip'
- url = 'http://www.nirsoft.net/utils/bluescreenview-x64.zip'
- download_to_temp(name, url)
+ download_to_temp('bluescreenview32.zip', SOURCE_URLS['BlueScreenView32'])
+ download_to_temp('bluescreenview64.zip', SOURCE_URLS['BlueScreenView64'])
# Extract files
extract_temp_to_cbin('bluescreenview64.zip', 'BlueScreenView', sz_args=['BlueScreenView.exe'])
shutil.move(
r'{}\BlueScreenView\BlueScreenView.exe'.format(global_vars['CBinDir']),
r'{}\BlueScreenView\BlueScreenView64.exe'.format(global_vars['CBinDir']))
- extract_temp_to_cbin('bluescreenview.zip', 'BlueScreenView')
+ extract_temp_to_cbin('bluescreenview32.zip', 'BlueScreenView')
# Cleanup
- remove_from_temp('bluescreenview.zip')
+ remove_from_temp('bluescreenview32.zip')
remove_from_temp('bluescreenview64.zip')
def update_du():
@@ -400,9 +254,7 @@ def update_du():
remove_from_kit('Du')
# Download
- name = 'du.zip'
- url = 'https://download.sysinternals.com/files/DU.zip'
- download_to_temp(name, url)
+ download_to_temp('du.zip', SOURCE_URLS['Du'])
# Extract files
extract_temp_to_cbin('du.zip', 'Du')
@@ -418,9 +270,7 @@ def update_erunt():
remove_from_kit('ERUNT')
# Download
- name = 'erunt.zip'
- url = 'http://www.aumha.org/downloads/erunt.zip'
- download_to_temp(name, url)
+ download_to_temp('erunt.zip', SOURCE_URLS['ERUNT'])
# Extract files
extract_temp_to_cbin('erunt.zip', 'ERUNT')
@@ -438,13 +288,8 @@ def update_hitmanpro():
# Download
dest = r'{}\HitmanPro'.format(global_vars['CBinDir'])
- name = 'HitmanPro.exe'
- url = 'https://dl.surfright.nl/HitmanPro.exe'
- download_generic(dest, name, url)
-
- name = 'HitmanPro64.exe'
- url = 'https://dl.surfright.nl/HitmanPro_x64.exe'
- download_generic(dest, name, url)
+ download_generic(dest, 'HitmanPro.exe', SOURCE_URLS['HitmanPro32'])
+ download_generic(dest, 'HitmanPro64.exe', SOURCE_URLS['HitmanPro64'])
def update_hwinfo():
## NOTE: Lives in .bin uncompressed
@@ -453,13 +298,8 @@ def update_hwinfo():
kill_process(exe)
# Download
- name = 'HWiNFO32.zip'
- url = 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip'
- download_to_temp(name, url)
-
- name = 'HWiNFO64.zip'
- url = 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip'
- download_to_temp(name, url)
+ download_to_temp('HWiNFO32.zip', SOURCE_URLS['HWiNFO32'])
+ download_to_temp('HWiNFO64.zip', SOURCE_URLS['HWiNFO64'])
# Extract files
extract_temp_to_bin('HWiNFO32.zip', 'HWiNFO')
@@ -478,23 +318,18 @@ def update_produkey():
remove_from_kit('ProduKey')
# Download
- name = 'produkey.zip'
- url = 'http://www.nirsoft.net/utils/produkey.zip'
- download_to_temp(name, url)
-
- name = 'produkey64.zip'
- url = 'http://www.nirsoft.net/utils/produkey-x64.zip'
- download_to_temp(name, url)
+ download_to_temp('produkey32.zip', SOURCE_URLS['ProduKey32'])
+ download_to_temp('produkey64.zip', SOURCE_URLS['ProduKey64'])
# Extract files
extract_temp_to_cbin('produkey64.zip', 'ProduKey', sz_args=['ProduKey.exe'])
shutil.move(
r'{}\ProduKey\ProduKey.exe'.format(global_vars['CBinDir']),
r'{}\ProduKey\ProduKey64.exe'.format(global_vars['CBinDir']))
- extract_temp_to_cbin('produkey.zip', 'ProduKey')
+ extract_temp_to_cbin('produkey32.zip', 'ProduKey')
# Cleanup
- remove_from_temp('produkey.zip')
+ remove_from_temp('produkey32.zip')
remove_from_temp('produkey64.zip')
## Drivers ##
@@ -510,7 +345,7 @@ def update_intel_rst():
shutil.copytree(include_path, dest)
# Download
- for name, url in RST_FILES.items():
+ for name, url in RST_SOURCES.items():
download_generic(dest, name, url)
def update_intel_ssd_toolbox():
@@ -518,32 +353,118 @@ def update_intel_ssd_toolbox():
remove_from_kit('Intel SSD Toolbox.exe')
# Download
- dest = r'{}\_Drivers'.format(global_vars['CBinDir'])
- name = 'Intel SSD Toolbox.exe'
- url = r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe'
- download_generic(dest, name, url)
+ download_generic(
+ r'{}\_Drivers'.format(global_vars['CBinDir']),
+ 'Intel SSD Toolbox.exe',
+ SOURCE_URLS['Intel SSD Toolbox'])
def update_samsung_magician():
# Remove existing folders
remove_from_kit('Samsung Magician.exe')
# Download
- dest = r'{}\_Drivers'.format(global_vars['CBinDir'])
- name = 'Samsung Magician.exe'
- url = 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe'
- download_generic(dest, name, url)
+ download_generic(
+ r'{}\_Drivers'.format(global_vars['CBinDir']),
+ 'Samsung Magician.exe',
+ SOURCE_URLS['Samsung Magician'])
-def update_sdi():
- #TODO
- pass
+def update_sdi_origin():
+ # Download aria2
+ download_to_temp('aria2.zip', SOURCE_URLS['aria2'])
+ aria_source = r'{}\aria2.zip'.format(global_vars['TmpDir'])
+ aria_dest = r'{}\aria2'.format(global_vars['TmpDir'])
+ aria = r'{}\aria2c.exe'.format(aria_dest)
+ extract_generic(aria_source, aria_dest, mode='e')
+
+ # Prep for torrent download
+ download_to_temp('sdio.torrent', SOURCE_URLS['SDIO Torrent'])
+ sdio_torrent = r'{}\sdio.torrent'.format(global_vars['TmpDir'])
+ out = run_program([aria, sdio_torrent, '-S'])
+ indexes = []
+ for line in out.stdout.decode().splitlines():
+ r = re.search(r'^\s*(\d+)\|(.*)', line)
+ if r and not re.search(r'(\.(bat|inf)|Video|Server|Printer|XP)', line, re.IGNORECASE):
+ indexes.append(int(r.group(1)))
+ indexes = [str(i) for i in sorted(indexes)]
+
+ # Download SDI Origin
+ cmd = [
+ aria,
+ '--select-file={}'.format(','.join(indexes)),
+ '-d', aria_dest,
+ '--seed-time=0',
+ sdio_torrent,
+ '-new_console:n', '-new_console:s33V',
+ ]
+ run_program(cmd, pipe=False, check=False, shell=True)
+ sleep(1)
+ wait_for_process('aria2c')
+
+ # Download SDI Origin extra themes
+ download_to_temp('sdio_themes.zip', SOURCE_URLS['SDIO Themes'])
+ theme_source = r'{}\sdio_themes.zip'.format(global_vars['TmpDir'])
+ theme_dest = r'{}\SDIO_Update\tools\SDI\themes'.format(aria_dest)
+ extract_generic(theme_source, theme_dest)
+
+ # Move files into place
+ for item in os.scandir(r'{}\SDIO_Update'.format(aria_dest)):
+ dest_item = '{}\_Drivers\SDIO\{}'.format(
+ global_vars['BinDir'], item.name)
+ r = re.search(r'^SDIO_x?(64|)_?R.*exe$', item.name, re.IGNORECASE)
+ if r:
+ dest_item = dest_item.replace(item.name, 'SDIO{}.exe'.format(
+ r.group(1)))
+ if (not os.path.exists(dest_item)
+ and not re.search(r'\.(inf|bat)$', item.name, re.IGNORECASE)):
+ shutil.move(item.path, dest_item)
+
+ # Cleanup
+ remove_from_temp('aria2')
+ remove_from_temp('aria2.zip')
+ remove_from_temp('sdio.torrent')
+ remove_from_temp('sdio_themes.zip')
## Installers ##
def update_adobe_reader_dc():
- pass
+ # Prep
+ dest = r'{}\.root_items\Installers\Extras\Office'.format(
+ global_vars['BaseDir'])
+ if os.path.exists(r'{}\Installers'.format(global_vars['BaseDir'])):
+ dest = dest.replace(r'\.root_items', '')
+
+ # Remove existing folders
+ try:
+ os.remove(r'{}\Adobe Reader DC.exe'.format(dest))
+ except FileNotFoundError:
+ pass
+
+ # Download
+ download_generic(
+ dest, 'Adobe Reader DC.exe', SOURCE_URLS['Adobe Reader DC'])
## Misc ##
def update_everything():
- pass
+ # Stop running processes
+ for exe in ['Everything.exe', 'Everything64.exe']:
+ kill_process(exe)
+
+ # Remove existing folders
+ remove_from_kit('Everything')
+
+ # Download
+ download_to_temp('everything32.zip', SOURCE_URLS['Everything32'])
+ download_to_temp('everything64.zip', SOURCE_URLS['Everything64'])
+
+ # Extract files
+ extract_temp_to_cbin('everything64.zip', 'Everything', sz_args=['Everything.exe'])
+ shutil.move(
+ r'{}\Everything\Everything.exe'.format(global_vars['CBinDir']),
+ r'{}\Everything\Everything64.exe'.format(global_vars['CBinDir']))
+ extract_temp_to_cbin('everything32.zip', 'Everything')
+
+ # Cleanup
+ remove_from_temp('everything32.zip')
+ remove_from_temp('everything64.zip')
def update_notepadplusplus():
# Stop running processes
@@ -553,9 +474,7 @@ def update_notepadplusplus():
remove_from_kit('NotepadPlusPlus')
# Download
- name = 'npp.7z'
- url = 'https://notepad-plus-plus.org/repository/7.x/7.5.1/npp.7.5.1.bin.minimalist.7z'
- download_to_temp(name, url)
+ download_to_temp('npp.7z', SOURCE_URLS['NotepadPlusPlus'])
# Extract files
extract_temp_to_cbin('npp.7z', 'NotepadPlusPlus')
@@ -568,52 +487,159 @@ def update_notepadplusplus():
remove_from_temp('npp.7z')
def update_treesizefree():
- pass
+ # Stop running processes
+ kill_process('TreeSizeFree.exe')
+
+ # Remove existing folders
+ remove_from_kit('TreeSizeFree-Portable')
+
+ # Download
+ download_to_temp(
+ 'treesizefree.zip.gz', SOURCE_URLS['TreeSizeFree-Portable'])
+
+ # Extract files
+ ## NOTE: When downloaded using requests it is a .zip.gz?
+ source = r'{}\treesizefree.zip.gz'.format(global_vars['TmpDir'])
+ download_to_temp(name, url)
+ extract_generic(source, global_vars['TmpDir'])
+ extract_temp_to_cbin('treesizefree.zip', 'TreeSizeFree-Portable')
+
+ # Cleanup
+ remove_from_temp('treesizefree.zip')
+ remove_from_temp('treesizefree.zip.gz')
def update_xmplay():
- pass
+ # Stop running processes
+ kill_process('xmplay.exe')
+
+ # Remove existing folders
+ remove_from_kit('XMPlay')
+
+ # Download
+ download_to_temp('xmplay.zip', SOURCE_URLS['XMPlay'])
+ download_to_temp('xmp-7z.zip', SOURCE_URLS['XMPlay 7z'])
+ download_to_temp('xmp-gme.zip', SOURCE_URLS['XMPlay Game'])
+ download_to_temp('xmp-rar.zip', SOURCE_URLS['XMPlay RAR'])
+ download_to_temp('WAModern.zip', SOURCE_URLS['XMPlay WAModern'])
+
+ # Extract files
+ extract_temp_to_cbin('xmplay.zip', 'XMPlay',
+ mode='e', sz_args=['xmplay.exe', 'xmplay.txt'])
+ for item in ['xmp-7z', 'xmp-gme', 'xmp-rar', 'WAModern']:
+ filter = []
+ if item == 'WAModern':
+ filter.append('WAModern NightVision.xmpskin')
+ extract_generic(
+ r'{}\{}.zip'.format(global_vars['TmpDir'], item),
+ r'{}\XMPlay\plugins'.format(global_vars['CBinDir']),
+ mode='e', sz_args=filter)
+
+ # Download Music
+ dest = r'{}\XMPlay\music_tmp\MOD'.format(global_vars['CBinDir'])
+ for mod in MUSIC_MOD:
+ name = mod.split('#')[-1]
+ url = 'https://api.modarchive.org/downloads.php?moduleid={}'.format(mod)
+ download_generic(dest, name, url)
+ dest = r'{}\XMPlay\music_tmp\SNES'.format(global_vars['CBinDir'])
+ for game in MUSIC_SNES:
+ name = '{}.rsn'.format(game)
+ url = 'http://snesmusic.org/v2/download.php?spcNow={}'.format(game)
+ download_generic(dest, name, url)
+
+ # Compress Music
+ cmd = [
+ global_vars['Tools']['SevenZip'],
+ 'a', r'{}\XMPlay\music.7z'.format(global_vars['CBinDir']),
+ '-t7z', '-mx=9', '-bso0', '-bse0',
+ r'{}\XMPlay\music_tmp\*'.format(global_vars['CBinDir']),
+ ]
+ run_program(cmd)
+
+ # Cleanup
+ remove_item(r'{}\XMPlay\music_tmp'.format(global_vars['CBinDir']))
+ remove_from_temp('xmplay.zip')
+ remove_from_temp('xmp-7z.zip')
+ remove_from_temp('xmp-gme.zip')
+ remove_from_temp('xmp-rar.zip')
+ remove_from_temp('WAModern.zip')
## Repairs ##
def update_adwcleaner():
- #def update_adwcleaner():
- # path = global_vars['BinDir']
- # name = 'AdwCleaner.exe'
- # _dl_page = 'http://www.bleepingcomputer.com/download/adwcleaner/dl/125/'
- # _regex = r'href=.*http(s|)://download\.bleepingcomputer\.com/dl/[a-zA-Z0-9]+/[a-zA-Z0-9]+/windows/security/security-utilities/a/adwcleaner/AdwCleaner\.exe'
- # url = resolve_dynamic_url(_dl_page, _regex)
- # download_to_temp(path, name, url)
- #
- pass
+ # Stop running processes
+ kill_process('AdwCleaner.exe')
+
+ # Remove existing folders
+ remove_from_kit('AdwCleaner')
+
+ # Download
+ url = resolve_dynamic_url(
+ SOURCE_URLS['AdwCleaner'],
+ 'id="downloadLink"')
+ download_generic(
+ r'{}\AdwCleaner'.format(global_vars['CBinDir']), 'AdwCleaner.exe', url)
def update_kvrt():
- #def update_kvrt():
- # path = global_vars['BinDir']
- # name = 'KVRT.exe'
- # url = 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe'
- # download_to_temp(path, name, url)
- pass
+ # Stop running processes
+ kill_process('KVRT.exe')
+
+ # Remove existing folders
+ remove_from_kit('KVRT')
+
+ # Download
+ download_generic(
+ r'{}\KVRT'.format(global_vars['CBinDir']),
+ 'KVRT.exe',
+ SOURCE_URLS['KVRT'])
def update_rkill():
- #def update_rkill():
- # path = '{BinDir}/RKill'.format(**global_vars)
- # name = 'RKill.exe'
- # _dl_page = 'http://www.bleepingcomputer.com/download/rkill/dl/10/'
- # _regex = r'href=.*http(s|)://download\.bleepingcomputer\.com/dl/[a-zA-Z0-9]+/[a-zA-Z0-9]+/windows/security/security-utilities/r/rkill/rkill\.exe'
- # url = resolve_dynamic_url(_dl_page, _regex)
- # download_to_temp(path, name, url)
- pass
+ # Stop running processes
+ kill_process('RKill.exe')
+
+ # Remove existing folders
+ remove_from_kit('RKill')
+
+ # Download
+ url = resolve_dynamic_url(
+ SOURCE_URLS['RKill'],
+ 'href.*rkill\.exe')
+ download_generic(
+ r'{}\RKill'.format(global_vars['CBinDir']), 'RKill.exe', url)
def update_tdsskiller():
- #def update_tdsskiller():
- # path = global_vars['BinDir']
- # name = 'TDSSKiller.exe'
- # url = 'http://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe'
- # download_to_temp(path, name, url)
- pass
+ # Stop running processes
+ kill_process('TDSSKiller.exe')
+
+ # Remove existing folders
+ remove_from_kit('TDSSKiller')
+
+ # Download
+ download_generic(
+ r'{}\TDSSKiller'.format(global_vars['CBinDir']),
+ 'TDSSKiller.exe',
+ SOURCE_URLS['TDSSKiller'])
## Uninstallers ##
def update_iobit_uninstaller():
- pass
+ # Stop running processes
+ kill_process('IObitUninstallerPortable.exe')
+
+ # Remove existing folders
+ remove_from_kit('IObitUninstallerPortable')
+
+ # Download
+ download_generic(
+ global_vars['CBinDir'],
+ 'IObitUninstallerPortable.exe',
+ SOURCE_URLS['IOBit_Uninstaller'])
+
+ # "Install"
+ cmd = r'{}\IObitUninstallerPortable.exe'.format(global_vars['CBinDir'])
+ popen_program(cmd)
+ sleep(1)
+ wait_for_process('IObitUninstallerPortable')
+
+ # Cleanup
+ remove_from_kit('IObitUninstallerPortable.exe')
if __name__ == '__main__':
print("This file is not meant to be called directly.")
diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py
index 3adca3a1..17e58865 100644
--- a/.bin/Scripts/settings/launchers.py
+++ b/.bin/Scripts/settings/launchers.py
@@ -443,10 +443,10 @@ LAUNCHERS = {
'L_NCMD': 'True',
'L_WAIT': '',
},
- 'Snappy Driver Installer': {
+ 'Snappy Driver Installer Origin': {
'L_TYPE': 'Program',
- 'L_PATH': '_Drivers\SDI',
- 'L_ITEM': 'SDI.exe',
+ 'L_PATH': '_Drivers\SDIO',
+ 'L_ITEM': 'SDIO.exe',
'L_ARGS': '',
'L_7ZIP': '',
'L_CHCK': 'True',
@@ -676,7 +676,7 @@ LAUNCHERS = {
'L_NCMD': 'True',
'L_WAIT': '',
},
- 'TreeSizeFree': {
+ 'TreeSizeFree-Portable': {
'L_TYPE': 'Program',
'L_PATH': 'TreeSizeFree',
'L_ITEM': 'TreeSizeFree.exe',
diff --git a/.bin/Scripts/settings/music.py b/.bin/Scripts/settings/music.py
new file mode 100644
index 00000000..a2d49f31
--- /dev/null
+++ b/.bin/Scripts/settings/music.py
@@ -0,0 +1,70 @@
+# Wizard Kit: Settings - Music
+
+MUSIC_MOD = [
+ '104208#banana_boat.mod',
+ '114971#tilbury_fair.mod',
+ '132563#ufo_tune.mod',
+ '135906#magnetik_girl.xm',
+ '140628#autumn_in_budapest.xm',
+ '143198#summer_memories_3.xm',
+ '144405#hillbilly_billyboy.xm',
+ '154795#4mat_-_eternity.xm',
+ '155845#bookworm.mo3',
+ '155914#battleofsteel.xm',
+ '158975#1_channel_moog.it',
+ '165495#trans.s3m',
+ '168513#necros_-_introspection.s3m',
+ '169628#radix_-_feng_shui_schematics.xm',
+ '175238#unknown48_-_twilight.mod',
+ '33432#ambrozia.xm',
+ '33460#amigatre.mod',
+ '34594#CHARIOT.S3M',
+ '34596#BUTTERFL.XM',
+ '34654#CTGOBLIN.S3M',
+ '35151#bananasplit.mod',
+ '35280#DEADLOCK.XM',
+ '38591#compo_liam.xm',
+ '39987#crystald.s3m',
+ '40475#ELYSIUM.MOD',
+ '42146#enigma.mod',
+ '42519#GHOST2.MOD',
+ '42560#GSLINGER.MOD',
+ '42872#existing.xm',
+ '50427#nf-stven.xm',
+ '51549#overture.mod',
+ '54250#SATELL.S3M',
+ '54313#realmk.s3m',
+ '55789#scrambld.mod',
+ '57934#spacedeb.mod',
+ '59344#stardstm.mod',
+ '60395#2ND_PM.S3M',
+ '66187#external.xm',
+ '66343#beek-substitutionology.it',
+ '67561#radix-unreal_superhero.xm',
+ '70829#inside_out.s3m',
+ '83779#beyond_music.mod',
+ ]
+
+MUSIC_SNES = [
+ 'actr',
+ 'crock',
+ 'ct',
+ 'dkc',
+ 'dkq',
+ 'ff6',
+ 'fz',
+ 'loz3',
+ 'mmx',
+ 'ptws',
+ 'scv4',
+ 'sf',
+ 'sf2',
+ 'sgng',
+ 'smk',
+ 'smw',
+ 'yi',
+ 'zamn'
+ ]
+
+if __name__ == '__main__':
+ print("This file is not meant to be called directly.")
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
new file mode 100644
index 00000000..00a23d43
--- /dev/null
+++ b/.bin/Scripts/settings/sources.py
@@ -0,0 +1,173 @@
+# Wizard Kit: Settings - Sources
+
+SOURCE_URLS = {
+ 'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.5.1/npp.7.5.1.bin.minimalist.7z',
+ 'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip',
+ 'FastCopy32': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip',
+ 'FastCopy64': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip',
+ 'XYplorerFree': 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip',
+ 'AIDA64': 'http://download.aida64.com/aida64engineer592.zip',
+ 'Autoruns': 'https://download.sysinternals.com/files/Autoruns.zip',
+ 'BleachBit': 'https://download.bleachbit.org/beta/1.17/BleachBit-1.17-portable.zip',
+ 'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
+ 'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip',
+ 'BlueScreenView64': 'http://www.nirsoft.net/utils/bluescreenview-x64.zip',
+ 'Du': 'https://download.sysinternals.com/files/DU.zip',
+ 'ERUNT': 'http://www.aumha.org/downloads/erunt.zip',
+ 'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
+ 'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
+ 'HWiNFO32': 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip',
+ 'HWiNFO64': 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip',
+ 'ProduKey32': 'http://www.nirsoft.net/utils/produkey.zip',
+ 'ProduKey64': 'http://www.nirsoft.net/utils/produkey-x64.zip',
+ 'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe',
+ 'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe',
+ 'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip',
+ 'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent',
+ 'SDIO Themes': 'http://snappy-driver-installer.org/downloads/SDIO_Themes.zip',
+ 'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1800920044/AcroRdrDC1800920044_en_US.exe',
+ 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.877.x86.zip',
+ 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.877.x64.zip',
+ 'TreeSizeFree-Portable': 'https://www.jam-software.com/treesize_free/TreeSizeFree-Portable.zip',
+ 'XMPlay': 'http://support.xmplay.com/files/20/xmplay3823.zip?v=115916',
+ 'XMPlay 7z': 'http://support.xmplay.com/files/16/xmp-7z.zip?v=800962',
+ 'XMPlay Game': 'http://support.xmplay.com/files/12/xmp-gme.zip?v=515637',
+ 'XMPlay RAR': 'http://support.xmplay.com/files/16/xmp-rar.zip?v=409646',
+ 'XMPlay WAModern': 'http://support.xmplay.com/files/10/WAModern.zip?v=207099',
+ 'AdwCleaner': 'https://toolslib.net/downloads/finish/1-adwcleaner/',
+ 'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
+ 'RKill': 'https://www.bleepingcomputer.com/download/rkill/dl/10/',
+ 'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
+ 'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.0.2.49.paf.exe',
+ }
+NINITE_SOURCES = {
+ 'Bundles': {
+ 'Runtimes.exe': '.net4.7-air-java8-silverlight',
+ 'Legacy.exe': '.net4.7-7zip-air-chrome-firefox-java8-silverlight-vlc',
+ 'Modern.exe': '.net4.7-7zip-air-chrome-classicstart-firefox-java8-silverlight-vlc',
+ },
+ 'Audio-Video': {
+ 'AIMP.exe': 'aimp',
+ 'Audacity.exe': 'audacity',
+ 'CCCP.exe': 'cccp',
+ 'Foobar2000.exe': 'foobar',
+ 'GOM.exe': 'gom',
+ 'HandBrake.exe': 'handbrake',
+ 'iTunes.exe': 'itunes',
+ 'K-Lite Codecs.exe': 'klitecodecs',
+ 'MediaMonkey.exe': 'mediamonkey',
+ 'MusicBee.exe': 'musicbee',
+ 'Spotify.exe': 'spotify',
+ 'VLC.exe': 'vlc',
+ 'Winamp.exe': 'winamp',
+ },
+ 'Cloud Storage': {
+ 'Dropbox.exe': 'dropbox',
+ 'Google Backup & Sync.exe': 'googlebackupandsync',
+ 'Mozy.exe': 'mozy',
+ 'OneDrive.exe': 'onedrive',
+ 'SugarSync.exe': 'sugarsync',
+ },
+ 'Communication': {
+ 'Pidgin.exe': 'pidgin',
+ 'Skype.exe': 'skype',
+ 'Trillian.exe': 'trillian',
+ },
+ 'Compression': {
+ '7-Zip.exe': '7zip',
+ 'PeaZip.exe': 'peazip',
+ 'WinRAR.exe': 'winrar',
+ },
+ 'Developer': {
+ 'Eclipse.exe': 'eclipse',
+ 'FileZilla.exe': 'filezilla',
+ 'JDK 8.exe': 'jdk8',
+ 'JDK 8 (x64).exe': 'jdkx8',
+ 'Notepad++.exe': 'notepadplusplus',
+ 'PuTTY.exe': 'putty',
+ 'Python 2.exe': 'python',
+ 'Visual Studio Code.exe': 'vscode',
+ 'WinMerge.exe': 'winmerge',
+ 'WinSCP.exe': 'winscp',
+ },
+ 'File Sharing': {
+ 'qBittorrent.exe': 'qbittorrent',
+ },
+ 'Image-Photo': {
+ 'Blender.exe': 'blender',
+ 'FastStone.exe': 'faststone',
+ 'GIMP.exe': 'gimp',
+ 'Greenshot.exe': 'greenshot',
+ 'Inkscape.exe': 'inkscape',
+ 'IrfanView.exe': 'irfanview',
+ 'Krita.exe': 'krita',
+ 'Paint.NET.exe': 'paint.net',
+ 'ShareX.exe': 'sharex',
+ 'XnView.exe': 'xnview',
+ },
+ 'Misc': {
+ 'Evernote.exe': 'evernote',
+ 'Everything.exe': 'everything',
+ 'KeePass 2.exe': 'keepass2',
+ 'Google Earth.exe': 'googleearth',
+ 'NV Access.exe': 'nvda',
+ 'Steam.exe': 'steam',
+ },
+ 'Office': {
+ 'CutePDF.exe': 'cutepdf',
+ 'Foxit Reader.exe': 'foxit',
+ 'LibreOffice.exe': 'libreoffice',
+ 'OpenOffice.exe': 'openoffice',
+ 'PDFCreator.exe': 'pdfcreator',
+ 'SumatraPDF.exe': 'sumatrapdf',
+ 'Thunderbird.exe': 'thunderbird',
+ },
+ 'Runtimes': {
+ 'Adobe Air.exe': 'air',
+ 'dotNET.exe': '.net4.7',
+ 'Java 8.exe': 'java8',
+ 'Shockwave.exe': 'shockwave',
+ 'Silverlight.exe': 'silverlight',
+ },
+ 'Security': {
+ 'Avast.exe': 'avast',
+ 'AVG.exe': 'avg',
+ 'Avira.exe': 'avira',
+ 'Microsoft Security Essentials.exe': 'essentials',
+ 'Malwarebytes Anti-Malware.exe': 'malwarebytes',
+ 'Spybot 2.exe': 'spybot2',
+ 'SUPERAntiSpyware.exe': 'super',
+ },
+ 'Utilities': {
+ 'CDBurnerXP.exe': 'cdburnerxp',
+ 'Classic Start.exe': 'classicstart',
+ 'Glary Utilities.exe': 'glary',
+ 'ImgBurn.exe': 'imgburn',
+ 'InfraRecorder.exe': 'infrarecorder',
+ 'Launchy.exe': 'launchy',
+ 'RealVNC.exe': 'realvnc',
+ 'Revo Uninstaller.exe': 'revo',
+ 'TeamViewer 12.exe': 'teamviewer12',
+ 'TeraCopy.exe': 'teracopy',
+ 'WinDirStat.exe': 'windirstat',
+ },
+ 'Web Browsers': {
+ 'Google Chrome.exe': 'chrome',
+ 'Mozilla Firefox.exe': 'firefox',
+ 'Opera Chromium.exe': 'operaChromium',
+ },
+ }
+RST_SOURCES = {
+ #SetupRST_12.0.exe : Removed from download center?
+ #SetupRST_12.5.exe : Removed from download center?
+ #SetupRST_12.8.exe : Removed from download center?
+ 'SetupRST_12.9.exe': 'https://downloadmirror.intel.com/23496/eng/SetupRST.exe',
+ #SetupRST_13.x.exe : Broken, doesn't support > .NET 4.5
+ 'SetupRST_14.0.exe': 'https://downloadmirror.intel.com/25091/eng/SetupRST.exe',
+ 'SetupRST_14.8.exe': 'https://downloadmirror.intel.com/26759/eng/setuprst.exe',
+ 'SetupRST_15.8.exe': 'https://downloadmirror.intel.com/27147/eng/SetupRST.exe',
+ }
+
+
+if __name__ == '__main__':
+ print("This file is not meant to be called directly.")
diff --git a/.bin/Scripts/settings/tools.py b/.bin/Scripts/settings/tools.py
new file mode 100644
index 00000000..118119a4
--- /dev/null
+++ b/.bin/Scripts/settings/tools.py
@@ -0,0 +1,55 @@
+# Wizard Kit: Settings - Tools
+
+TOOLS = {
+ # NOTE: BinDir will be prepended to these paths at runtime
+ 'AIDA64': {
+ '32': r'AIDA64\aida64.exe'},
+ 'AutoRuns': {
+ '32': r'Autoruns\autoruns.exe',
+ '64': r'Autoruns\autoruns64.exe'},
+ 'BleachBit': {
+ '32': r'BleachBit-Portable\bleachbit_console.exe'},
+ 'Caffeine': {
+ '32': r'Caffeine\caffeine.exe'},
+ 'Du': {
+ '32': r'Du\du.exe',
+ '64': r'Du\du64.exe'},
+ 'ERUNT': {
+ '32': r'ERUNT\ERUNT.EXE'},
+ 'Everything': {
+ '32': r'Everything\Everything.exe',
+ '64': r'Everything\Everything64.exe'},
+ 'FastCopy': {
+ '32': r'FastCopy\FastCopy.exe',
+ '64': r'FastCopy\FastCopy64.exe'},
+ 'HitmanPro': {
+ '32': r'HitmanPro\HitmanPro.exe',
+ '64': r'HitmanPro\HitmanPro64.exe'},
+ 'HWiNFO': {
+ '32': r'HWiNFO\HWiNFO.exe',
+ '64': r'HWiNFO\HWiNFO64.exe'},
+ 'KVRT': {
+ '32': r'KVRT\KVRT.exe'},
+ 'NotepadPlusPlus': {
+ '32': r'NotepadPlusPlus\notepadplusplus.exe'},
+ 'ProduKey': {
+ '32': r'ProduKey\ProduKey.exe',
+ '64': r'ProduKey\ProduKey64.exe'},
+ 'PuTTY-PSFTP': {
+ '32': r'PuTTY\PSFTP.EXE'},
+ 'RKill': {
+ '32': r'RKill\RKill.exe'},
+ 'SevenZip': {
+ '32': r'7-Zip\7za.exe',
+ '64': r'7-Zip\7za64.exe'},
+ 'TDSSKiller': {
+ '32': r'TDSSKiller\TDSSKiller.exe'},
+ 'wimlib-imagex': {
+ '32': r'wimlib\x32\wimlib-imagex.exe',
+ '64': r'wimlib\x64\wimlib-imagex.exe'},
+ 'XMPlay': {
+ '32': r'XMPlay\xmplay.exe'},
+ }
+
+if __name__ == '__main__':
+ print("This file is not meant to be called directly.")
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 71cec02b..fc32186b 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -49,16 +49,16 @@ if __name__ == '__main__':
try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results)
try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results)
try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results)
- try_and_print(message='Snappy Driver Installer...', function=update_sdi, other_results=other_results)
+ try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results)
# Installers
print_info('\nInstallers')
try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results)
print_info('\nNinite')
- for section in sorted(NINITE_FILES.keys()):
+ for section in sorted(NINITE_SOURCES.keys()):
print_success(' {}'.format(section))
dest = r'{}\_Ninite\{}'.format(global_vars['CBinDir'], section)
- for name, url in sorted(NINITE_FILES[section].items()):
+ for name, url in sorted(NINITE_SOURCES[section].items()):
url = 'https://ninite.com/{}/ninite.exe'.format(url)
try_and_print(message=name, function=download_generic,
other_results=other_results,
diff --git a/.bin/SDI/sdi.cfg b/.bin/_Drivers/SDIO/sdi.cfg
similarity index 79%
rename from .bin/SDI/sdi.cfg
rename to .bin/_Drivers/SDIO/sdi.cfg
index 471c83d1..9abde84d 100644
--- a/.bin/SDI/sdi.cfg
+++ b/.bin/_Drivers/SDIO/sdi.cfg
@@ -13,6 +13,7 @@
-hintdelay:250
-license:1
-scale:256
+-wndsc:3
-filters:166
-port:50171
@@ -20,4 +21,4 @@
-uplimit:1
-connections:0
--expertmode -norestorepnt -novirusalerts -showdrpnames2 -onlyupdates -preservecfg
\ No newline at end of file
+-expertmode -norestorepnt -showdrpnames2 -onlyupdates -preservecfg
\ No newline at end of file
diff --git a/.cbin/_include/XMPlay/xmplay.ini b/.cbin/_include/XMPlay/xmplay.ini
new file mode 100644
index 00000000..5432bfdf
--- /dev/null
+++ b/.cbin/_include/XMPlay/xmplay.ini
@@ -0,0 +1,139 @@
+[XMPlay]
+MixMode=56
+AutoName=0
+WriteSource=0
+WriteSourceRes=1
+WriteSepInst=0
+WriteNoExt=0
+WriteTitle=0
+AutoAmp=1
+RGain=0
+RGainAmp=0
+RGainLimit=0
+Time=1
+ShowTenths=1
+TimeHours=1
+Volume=90
+LogVolume=1
+Balance=50
+Amplify=-1074017600
+AmpReset=1
+PanSep=50
+Loop=0
+LoopLimit=1
+LoopLimitTime=0
+DecayEnd=5
+LoopList=1
+ListTotal=0
+UnloadLast=0
+AutoAdvance=1
+ListSort=0
+FollowList=0
+AutoRemove=0
+Trim=0
+NoMute=0
+Fade=0
+NetBuffer=5
+NetPreBuffer=3
+NetTimeout=10
+RestrictRate=0
+AutoReconnect=0
+Proxy=1
+ProxyConfig=
+Dither=0
+CrossFadeLen=0
+CrossFadeChange=0
+MODmode=0
+MODtimeinfo=1
+MODxfx=0
+MODloop=1
+MODloopreset=0
+MODvirtchans=256
+Mini=0
+InTray=0
+OnTop=259
+MultiInstance=0
+SaveClosePos=0
+Bubbles=3
+FadeBubbles=1
+InfoMove=0
+WindowLock=0
+PanelPos=-268374016
+ListFilenames=0
+ListQueue=0
+ListClick=1793
+AutoSave=0
+ListCols=-2146959349
+Verify=1
+NoDuplicates=0
+ScanHTML=1
+ArchiveLevel=2
+SearchDrives=0
+Random=3
+DeadStop=0
+Queue=0
+QueueStop=0
+QueuePlay=0
+QueueToggle=1
+SubDir=0
+TitleNoExt=0
+TitleSpaces=0
+TitleSubsongs=0
+TitleCUE=1
+TitleScroll=1
+TitleTray=3
+Clipboard=0
+AutoSet=0
+InfoResize=1
+InfoResizeLimit=500
+InfoTextSize=0
+InfoWidth=80
+InfoList=15
+InfoPaty=234
+InfoPatmc=20
+RestrictVis=0
+RestrictVisW=290
+RestrictVisH=218
+SpectrumSpeed=1
+VisSync=0
+VisTextSize=0
+VisRefresh=40
+HelpTextSize=0
+PanelOpen=0
+InfoPos=00020000000200005D0300003E030000
+VisSize=22010000DA000000
+FindSize=0000000000000000C8000000
+LibWidth=600
+LibSort=2
+LibMode=0
+LibCols=0000000000000000010000000000E04102000000000050410300000000005041040000000000E040050000000000E04006000000000040410700000000000000080000000000C04009000000000000000A0000000000E0400B0000000000E0400C000000000000000D000000000000000E000000000000000F00000000000000
+LibParseList=0
+LibFilePath=0
+LibAbrSize=1
+LibInlineText=1
+LibInfoTags=1
+LibKeepOverridden=1
+LibPlayTime=0
+LibAvgCount=0
+LibPlayReplace=0
+UpdateCheck=0
+UpdateTime=0
+IgnoreTypes=avi mpg mpeg
+FilePath=
+WritePath=X:\
+TitleForm=%?2{%2 - }%?1{%1|%0}
+TitleFormList=
+Find=
+FindPlay=0
+FindAutoList=0
+FindIn=3
+NoCheckDead=0
+CurTrack=64
+Info=197379
+Skin=plugins\WAModern NightVision
+External=464C414300666C6163202D54205449544C453D2531202D54204152544953543D2532202D5420414C42554D3D2533202D5420444154453D2534202D5420545241434B4E554D4245523D2535202D542047454E52453D2536202D5420434F4D4D454E543D2537202D6F20256F202D00666C616300404C414D45006C616D65202D2D616C742D707265736574207374616E64617264202D2D69676E6F72652D7461672D6572726F7273202D2D7474202531202D2D7461202532202D2D746C202533202D2D7479202534202D2D746E202535202D2D7467202536202D2D7463202537202D20256F006D703300864F4747454E43006F6767656E63202D74202531202D61202532202D6C202533202D64202534202D4E202535202D47202536202D6320636F6D6D656E743D2537202D6F20256F202D006F676700C800
+DSP=FF000200100000000000000040410000004100008041000100280000000000000000000000000000000000000000000000000000000000000000000000000000000000
+PluginTypes=
+Shortcuts=060000004F0018020C0000004F04180250000000500019025100000050041902500000001300450251000000130445025200000027004D035300000025004B0354000000240047035600000027044D035500000025044B03810000002100490380000000220051038200000023004F03700100002D005203710100002D045203900100005A022C027B0100005100100277010000BF0435025001000026004803580100002604480351010000280050035901000028045003540100002602480354010000280250035501000041021E02560100004902170260010000460221026401000046012102610100004600210262010000460421026301000046062102740100000D001C02750100002000390276010000BF0035027E010000BF023502720100002E005303730100002E045303000200006B004E02010200006D004A02070200006F003503080200006A003702010000004D003202020000004E003102030000004E0431020A00000073013E020B00000073053E0205000000780043020101000070003B020201000071003C020301000072003D020401000073003E020501000074003F0260020000750040020801000043022E02060100006800480207010000620050022101000064004B022201000066004D022301000065004C0224010000670047022501000069004902040000007B005802
+DeviceMode=0000000080BB000002000000020000008A0200000000000003000000
+Track1=0
diff --git a/.gitignore b/.gitignore
index b619bc53..ee338c3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,12 +15,17 @@
.bin/Python/
.bin/Tmp/
.bin/XMPlay/
+.bin/_Drivers/SDIO/
.cbin/AIDA64/
.cbin/Autoruns/
.cbin/BleachBit-Portable/
.cbin/BlueScreenView/
.cbin/Du/
+.cbin/Everything/
+.cbin/IObitUninstallerPortable/
.cbin/ProduKey/
.cbin/TestDisk/
+.cbin/TreeSizeFree-Portable/
+.cbin/XMPlay/
.cbin/XYplorerFree/
.cbin/_Drivers/
From ea4036e14d569b21c24732c8e0b1af1f1ca8d25d Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Mon, 20 Nov 2017 23:10:42 -0800
Subject: [PATCH 06/20] Added ODT downloads
---
.bin/Scripts/build_kit.ps1 | 2 +-
.bin/Scripts/functions/update.py | 30 +++++++++++++++++++++++++++++-
.bin/Scripts/settings/sources.py | 2 ++
.bin/Scripts/update_kit.py | 1 +
.cbin/_include/_Office/365_32.xml | 7 +++++++
.cbin/_include/_Office/365_64.xml | 7 +++++++
.cbin/_include/_Office/hb_32.xml | 7 +++++++
.cbin/_include/_Office/hb_64.xml | 7 +++++++
.cbin/_include/_Office/hs_32.xml | 7 +++++++
.cbin/_include/_Office/hs_64.xml | 7 +++++++
.gitignore | 1 +
11 files changed, 76 insertions(+), 2 deletions(-)
create mode 100644 .cbin/_include/_Office/365_32.xml
create mode 100644 .cbin/_include/_Office/365_64.xml
create mode 100644 .cbin/_include/_Office/hb_32.xml
create mode 100644 .cbin/_include/_Office/hb_64.xml
create mode 100644 .cbin/_include/_Office/hs_32.xml
create mode 100644 .cbin/_include/_Office/hs_64.xml
diff --git a/.bin/Scripts/build_kit.ps1 b/.bin/Scripts/build_kit.ps1
index 75d9bff2..187cf058 100644
--- a/.bin/Scripts/build_kit.ps1
+++ b/.bin/Scripts/build_kit.ps1
@@ -177,5 +177,5 @@ popd
if ($errors -gt 0) {
wk_pause "Press Enter to exit..."
} else {
- start "$bin\ConEmu\ConEmu.exe" -argumentlist @("-run", "$bin\Python\x32\python.exe", "$bin\Scripts\update_kit.py", "-new_console:c")
+ start "$bin\ConEmu\ConEmu.exe" -argumentlist @("-run", "$bin\Python\x32\python.exe", "$bin\Scripts\update_kit.py", "-new_console:c") -verb Runas
}
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 4a34f633..433d7861 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -1,5 +1,4 @@
# Wizard Kit: Functions - Build / Update
-## NOTE: This file is full of magic strings!
import requests
@@ -441,6 +440,35 @@ def update_adobe_reader_dc():
# Download
download_generic(
dest, 'Adobe Reader DC.exe', SOURCE_URLS['Adobe Reader DC'])
+
+def update_office():
+ # Remove existing folders
+ remove_from_kit('_Office')
+
+ # Prep
+ dest = r'{}\_Office'.format(global_vars['CBinDir'])
+ include_path = r'{}\_include\_Office'.format(global_vars['CBinDir'])
+ if os.path.exists(include_path):
+ shutil.copytree(include_path, dest)
+
+ # Download and extract
+ for year in ['2013', '2016']:
+ name = 'odt{}.exe'.format(year)
+ url = 'Office Deployment Tool {}'.format(year)
+ download_to_temp(name, SOURCE_URLS[url])
+ cmd = [
+ r'{}\odt{}.exe'.format(global_vars['TmpDir'], year),
+ r'/extract:{}\{}'.format(global_vars['TmpDir'], year),
+ '/quiet',
+ ]
+ run_program(cmd)
+ shutil.move(
+ r'{}\{}'.format(global_vars['TmpDir'], year),
+ r'{}\_Office\{}'.format(global_vars['CBinDir'], year))
+
+ # Cleanup
+ remove_from_temp('odt2013.exe')
+ remove_from_temp('odt2016.exe')
## Misc ##
def update_everything():
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index 00a23d43..14b9bb77 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -18,6 +18,8 @@ SOURCE_URLS = {
'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
'HWiNFO32': 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip',
'HWiNFO64': 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip',
+ 'Office Deployment Tool 2013': 'https://download.microsoft.com/download/6/2/3/6230F7A2-D8A9-478B-AC5C-57091B632FCF/officedeploymenttool_x86_4827-1000.exe',
+ 'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_8529.3600.exe',
'ProduKey32': 'http://www.nirsoft.net/utils/produkey.zip',
'ProduKey64': 'http://www.nirsoft.net/utils/produkey-x64.zip',
'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe',
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index fc32186b..6868b6c5 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -54,6 +54,7 @@ if __name__ == '__main__':
# Installers
print_info('\nInstallers')
try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results)
+ try_and_print(message='MS Office...', function=update_office, other_results=other_results)
print_info('\nNinite')
for section in sorted(NINITE_SOURCES.keys()):
print_success(' {}'.format(section))
diff --git a/.cbin/_include/_Office/365_32.xml b/.cbin/_include/_Office/365_32.xml
new file mode 100644
index 00000000..ac20b94d
--- /dev/null
+++ b/.cbin/_include/_Office/365_32.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/365_64.xml b/.cbin/_include/_Office/365_64.xml
new file mode 100644
index 00000000..1593ec31
--- /dev/null
+++ b/.cbin/_include/_Office/365_64.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/hb_32.xml b/.cbin/_include/_Office/hb_32.xml
new file mode 100644
index 00000000..e3cc6d52
--- /dev/null
+++ b/.cbin/_include/_Office/hb_32.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/hb_64.xml b/.cbin/_include/_Office/hb_64.xml
new file mode 100644
index 00000000..119f7bd9
--- /dev/null
+++ b/.cbin/_include/_Office/hb_64.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/hs_32.xml b/.cbin/_include/_Office/hs_32.xml
new file mode 100644
index 00000000..bb5190ae
--- /dev/null
+++ b/.cbin/_include/_Office/hs_32.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/hs_64.xml b/.cbin/_include/_Office/hs_64.xml
new file mode 100644
index 00000000..f5079d77
--- /dev/null
+++ b/.cbin/_include/_Office/hs_64.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ee338c3c..8f24a67b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
.cbin/XMPlay/
.cbin/XYplorerFree/
.cbin/_Drivers/
+.cbin/_Office/
From 3df01a0e05a2753251071617ec2df09a58f0272e Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Mon, 20 Nov 2017 23:11:07 -0800
Subject: [PATCH 07/20] no message
---
.bin/Scripts/functions/common.py | 2 +-
.bin/Scripts/update_kit.py | 1 +
.gitignore | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py
index 4fb57739..6b819ce3 100644
--- a/.bin/Scripts/functions/common.py
+++ b/.bin/Scripts/functions/common.py
@@ -369,7 +369,7 @@ def stay_awake():
if proc.name() == 'caffeine.exe':
return
# Extract and run
- extract_item('caffeine', silent=True)
+ extract_item('Caffeine', silent=True)
try:
popen_program(global_vars['Tools']['Caffeine'])
except Exception:
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 6868b6c5..b41599bb 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -67,6 +67,7 @@ if __name__ == '__main__':
# Misc
print_info('\nMisc')
+ try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results)
try_and_print(message='Everything...', function=update_everything, other_results=other_results)
try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results)
try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results)
diff --git a/.gitignore b/.gitignore
index 8f24a67b..1476f24d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
.cbin/Autoruns/
.cbin/BleachBit-Portable/
.cbin/BlueScreenView/
+.cbin/Caffeine/
.cbin/Du/
.cbin/Everything/
.cbin/IObitUninstallerPortable/
From f842cec65b6ddce6e31468894338223fe4cf7817 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Mon, 20 Nov 2017 23:11:07 -0800
Subject: [PATCH 08/20] Always more downloads
---
.bin/Scripts/functions/setup.py | 32 +++----
.bin/Scripts/functions/update.py | 135 +++++++++++++++++++++++++----
.bin/Scripts/settings/launchers.py | 11 +++
.bin/Scripts/settings/sources.py | 74 +++++++++++-----
.bin/Scripts/update_kit.py | 13 +--
.gitignore | 2 +
6 files changed, 208 insertions(+), 59 deletions(-)
diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py
index cc81e892..7d7722fd 100644
--- a/.bin/Scripts/functions/setup.py
+++ b/.bin/Scripts/functions/setup.py
@@ -85,35 +85,35 @@ SETTINGS_GOOGLE_CHROME = {
},
}
VCR_REDISTS = [
- {'Name': 'Visual C++ 2005 SP1 x32...',
- 'Cmd': ['msiexec', '/i', r'2005sp1\x86\vcredist.msi',
- '/qb!', '/norestart']},
- {'Name': 'Visual C++ 2005 SP1 x64...',
- 'Cmd': ['msiexec', '/i', r'2005sp1\x64\vcredist.msi',
- '/qb!', '/norestart']},
{'Name': 'Visual C++ 2008 SP1 x32...',
- 'Cmd': [r'2008sp1\vcredist_x86.exe', '/qb! /norestart']},
+ 'Cmd': [r'2008sp1\x32\vcredist.exe', '/qb! /norestart']},
{'Name': 'Visual C++ 2008 SP1 x64...',
- 'Cmd': [r'2008sp1\vcredist_x64.exe', '/qb! /norestart']},
+ 'Cmd': [r'2008sp1\x64\vcredist.exe', '/qb! /norestart']},
{'Name': 'Visual C++ 2010 x32...',
- 'Cmd': [r'2010\vcredist_x86.exe', '/passive', '/norestart']},
+ 'Cmd': [r'2010sp1\x32\vcredist.exe', '/passive', '/norestart']},
{'Name': 'Visual C++ 2010 x64...',
- 'Cmd': [r'2010\vcredist_x64.exe', '/passive', '/norestart']},
+ 'Cmd': [r'2010sp1\x64\vcredist.exe', '/passive', '/norestart']},
{'Name': 'Visual C++ 2012 Update 4 x32...',
- 'Cmd': [r'2012u4\vcredist_x86.exe', '/passive', '/norestart']},
+ 'Cmd': [r'2012u4\x32\vcredist.exe', '/passive', '/norestart']},
{'Name': 'Visual C++ 2012 Update 4 x64...',
- 'Cmd': [r'2012u4\vcredist_x64.exe', '/passive', '/norestart']},
+ 'Cmd': [r'2012u4\x64\vcredist.exe', '/passive', '/norestart']},
{'Name': 'Visual C++ 2013 x32...',
- 'Cmd': [r'2013\vcredist_x86.exe', '/install',
+ 'Cmd': [r'2013\x32\vcredist.exe', '/install',
'/passive', '/norestart']},
{'Name': 'Visual C++ 2013 x64...',
- 'Cmd': [r'2013\vcredist_x64.exe', '/install',
+ 'Cmd': [r'2013\x64\vcredist.exe', '/install',
'/passive', '/norestart']},
{'Name': 'Visual C++ 2015 Update 3 x32...',
- 'Cmd': [r'2015u3\vc_redist.x86.exe', '/install',
+ 'Cmd': [r'2015u3\x32\vcredist.exe', '/install',
'/passive', '/norestart']},
{'Name': 'Visual C++ 2015 Update 3 x64...',
- 'Cmd': [r'2015u3\vc_redist.x64.exe', '/install',
+ 'Cmd': [r'2015u3\x64\vcredist.exe', '/install',
+ '/passive', '/norestart']}]
+ {'Name': 'Visual C++ 2017 x32...',
+ 'Cmd': [r'2017\x32\vcredist.exe', '/install',
+ '/passive', '/norestart']},
+ {'Name': 'Visual C++ 2017 x64...',
+ 'Cmd': [r'2017\x64\vcredist.exe', '/install',
'/passive', '/norestart']}]
def config_classicstart():
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 433d7861..ef83f2c5 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -140,6 +140,29 @@ def update_fastcopy():
remove_from_temp('FastCopy32.zip')
remove_from_temp('FastCopy64.zip')
+def update_wimlib():
+ # Stop running processes
+ kill_process('wimlib-imagex.exe')
+
+ # Remove existing folders
+ remove_from_kit('wimlib')
+
+ # Download
+ download_to_temp('wimlib32.zip', SOURCE_URLS['wimlib32'])
+ download_to_temp('wimlib64.zip', SOURCE_URLS['wimlib64'])
+
+ # Extract
+ extract_generic(
+ r'{}\wimlib32.zip'.format(global_vars['TmpDir']),
+ r'{}\wimlib\x32'.format(global_vars['CBinDir']))
+ extract_generic(
+ r'{}\wimlib64.zip'.format(global_vars['TmpDir']),
+ r'{}\wimlib\x64'.format(global_vars['CBinDir']))
+
+ # Cleanup
+ remove_from_temp('wimlib32.zip')
+ remove_from_temp('wimlib64.zip')
+
def update_xyplorer():
# Stop running processes
kill_process('XYplorerFree.exe')
@@ -244,23 +267,6 @@ def update_bluescreenview():
remove_from_temp('bluescreenview32.zip')
remove_from_temp('bluescreenview64.zip')
-def update_du():
- # Stop running processes
- kill_process('du.exe')
- kill_process('du64.exe')
-
- # Remove existing folders
- remove_from_kit('Du')
-
- # Download
- download_to_temp('du.zip', SOURCE_URLS['Du'])
-
- # Extract files
- extract_temp_to_cbin('du.zip', 'Du')
-
- # Cleanup
- remove_from_temp('du.zip')
-
def update_erunt():
# Stop running processes
kill_process('ERUNT.EXE')
@@ -469,8 +475,71 @@ def update_office():
# Cleanup
remove_from_temp('odt2013.exe')
remove_from_temp('odt2016.exe')
+
+def update_classic_start_skin():
+ # Remove existing folders
+ remove_from_kit('ClassicStartSkin')
+ # Download
+ download_generic(
+ r'{}\ClassicStartSkin'.format(global_vars['CBinDir']),
+ 'Metro-Win10-Black.skin7',
+ SOURCE_URLS['ClassicStartSkin'])
+
+def update_vcredists():
+ # Remove existing folders
+ remove_from_kit('_vcredists')
+
+ # Prep
+ dest = r'{}\_vcredists'.format(global_vars['CBinDir'])
+ include_path = r'{}\_include\_vcredists'.format(global_vars['CBinDir'])
+ if os.path.exists(include_path):
+ shutil.copytree(include_path, dest)
+
+ # Download
+ for year in VCREDIST_SOURCES.keys():
+ for bit in ['32', '64']:
+ dest = r'{}\_vcredists\{}\x{}'.format(
+ global_vars['CBinDir'], year, bit)
+ download_generic(
+ dest,
+ 'vcredist.exe',
+ VCREDIST_SOURCES[year][bit])
+
## Misc ##
+def update_caffeine():
+ # Stop running processes
+ kill_process('caffeine.exe')
+
+ # Remove existing folders
+ remove_from_kit('Caffeine')
+
+ # Download
+ download_to_temp('caffeine.zip', SOURCE_URLS['Caffeine'])
+
+ # Extract files
+ extract_temp_to_cbin('caffeine.zip', 'Caffeine')
+
+ # Cleanup
+ remove_from_temp('caffeine.zip')
+
+def update_du():
+ # Stop running processes
+ kill_process('du.exe')
+ kill_process('du64.exe')
+
+ # Remove existing folders
+ remove_from_kit('Du')
+
+ # Download
+ download_to_temp('du.zip', SOURCE_URLS['Du'])
+
+ # Extract files
+ extract_temp_to_cbin('du.zip', 'Du')
+
+ # Cleanup
+ remove_from_temp('du.zip')
+
def update_everything():
# Stop running processes
for exe in ['Everything.exe', 'Everything64.exe']:
@@ -494,6 +563,22 @@ def update_everything():
remove_from_temp('everything32.zip')
remove_from_temp('everything64.zip')
+def update_firefox_ublock_origin():
+ # Remove existing folders
+ remove_from_kit('FirefoxExtensions')
+
+ # Download
+ download_to_temp('ff-uBO.xpi', SOURCE_URLS['Firefox uBO'])
+
+ # Extract files
+ extract_generic(
+ r'{}\ff-uBO.xpi'.format(global_vars['TmpDir']),
+ r'{}\FirefoxExtensions\uBlock0@raymondhill.net'.format(
+ global_vars['CBinDir']))
+
+ # Cleanup
+ remove_from_temp('ff-uBO.xpi')
+
def update_notepadplusplus():
# Stop running processes
kill_process('notepadplusplus.exe')
@@ -514,6 +599,22 @@ def update_notepadplusplus():
# Cleanup
remove_from_temp('npp.7z')
+def update_putty():
+ # Stop running processes
+ kill_process('PUTTY.EXE')
+
+ # Remove existing folders
+ remove_from_kit('PuTTY')
+
+ # Download
+ download_to_temp('putty.zip', SOURCE_URLS['PuTTY'])
+
+ # Extract files
+ extract_temp_to_cbin('putty.zip', 'PuTTY')
+
+ # Cleanup
+ remove_from_temp('putty.zip')
+
def update_treesizefree():
# Stop running processes
kill_process('TreeSizeFree.exe')
diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py
index 17e58865..a698fb1b 100644
--- a/.bin/Scripts/settings/launchers.py
+++ b/.bin/Scripts/settings/launchers.py
@@ -676,6 +676,17 @@ LAUNCHERS = {
'L_NCMD': 'True',
'L_WAIT': '',
},
+ 'PuTTY': {
+ 'L_TYPE': 'Program',
+ 'L_PATH': 'PuTTY',
+ 'L_ITEM': 'PUTTY.EXE',
+ 'L_ARGS': '',
+ 'L_7ZIP': '',
+ 'L_CHCK': 'True',
+ 'L_ELEV': '',
+ 'L_NCMD': 'True',
+ 'L_WAIT': '',
+ },
'TreeSizeFree-Portable': {
'L_TYPE': 'Program',
'L_PATH': 'TreeSizeFree',
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index 14b9bb77..41b7c493 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -1,46 +1,78 @@
# Wizard Kit: Settings - Sources
SOURCE_URLS = {
- 'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.5.1/npp.7.5.1.bin.minimalist.7z',
- 'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip',
- 'FastCopy32': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip',
- 'FastCopy64': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip',
- 'XYplorerFree': 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip',
'AIDA64': 'http://download.aida64.com/aida64engineer592.zip',
+ 'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1800920044/AcroRdrDC1800920044_en_US.exe',
+ 'AdwCleaner': 'https://toolslib.net/downloads/finish/1-adwcleaner/',
'Autoruns': 'https://download.sysinternals.com/files/Autoruns.zip',
'BleachBit': 'https://download.bleachbit.org/beta/1.17/BleachBit-1.17-portable.zip',
- 'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip',
'BlueScreenView64': 'http://www.nirsoft.net/utils/bluescreenview-x64.zip',
+ 'Caffeine': 'http://www.zhornsoftware.co.uk/caffeine/caffeine.zip',
+ 'ClassicStartSkin': 'http://www.classicshell.net/forum/download/file.php?id=3001&sid=9a195960d98fd754867dcb63d9315335',
'Du': 'https://download.sysinternals.com/files/DU.zip',
'ERUNT': 'http://www.aumha.org/downloads/erunt.zip',
- 'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
- 'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
+ 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.877.x86.zip',
+ 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.877.x64.zip',
+ 'FastCopy32': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip',
+ 'FastCopy64': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip',
+ 'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/764482/ublock_origin-1.14.18-an+fx.xpi?src=dp-btn-primary',
'HWiNFO32': 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip',
'HWiNFO64': 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip',
+ 'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
+ 'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
+ 'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.0.2.49.paf.exe',
+ 'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe',
+ 'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
+ 'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.5.1/npp.7.5.1.bin.minimalist.7z',
'Office Deployment Tool 2013': 'https://download.microsoft.com/download/6/2/3/6230F7A2-D8A9-478B-AC5C-57091B632FCF/officedeploymenttool_x86_4827-1000.exe',
'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_8529.3600.exe',
'ProduKey32': 'http://www.nirsoft.net/utils/produkey.zip',
'ProduKey64': 'http://www.nirsoft.net/utils/produkey-x64.zip',
- 'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe',
- 'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe',
- 'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip',
- 'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent',
+ 'PuTTY': 'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip',
+ 'RKill': 'https://www.bleepingcomputer.com/download/rkill/dl/10/',
'SDIO Themes': 'http://snappy-driver-installer.org/downloads/SDIO_Themes.zip',
- 'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1800920044/AcroRdrDC1800920044_en_US.exe',
- 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.877.x86.zip',
- 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.877.x64.zip',
+ 'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent',
+ 'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe',
+ 'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
+ 'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip',
'TreeSizeFree-Portable': 'https://www.jam-software.com/treesize_free/TreeSizeFree-Portable.zip',
- 'XMPlay': 'http://support.xmplay.com/files/20/xmplay3823.zip?v=115916',
+ 'wimlib32': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-i686-bin.zip',
+ 'wimlib64': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip',
+ 'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
'XMPlay 7z': 'http://support.xmplay.com/files/16/xmp-7z.zip?v=800962',
'XMPlay Game': 'http://support.xmplay.com/files/12/xmp-gme.zip?v=515637',
'XMPlay RAR': 'http://support.xmplay.com/files/16/xmp-rar.zip?v=409646',
'XMPlay WAModern': 'http://support.xmplay.com/files/10/WAModern.zip?v=207099',
- 'AdwCleaner': 'https://toolslib.net/downloads/finish/1-adwcleaner/',
- 'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
- 'RKill': 'https://www.bleepingcomputer.com/download/rkill/dl/10/',
- 'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
- 'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.0.2.49.paf.exe',
+ 'XMPlay': 'http://support.xmplay.com/files/20/xmplay3823.zip?v=115916',
+ 'XYplorerFree': 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip',
+ 'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip',
+ }
+VCREDIST_SOURCES = {
+ '2008sp1': {
+ '32': 'https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe',
+ '64': 'https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe',
+ },
+ '2010sp1': {
+ '32': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe',
+ '64': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe',
+ },
+ '2012u4': {
+ '32': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe',
+ '64': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe',
+ },
+ '2013': {
+ '32': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe',
+ '64': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe',
+ },
+ '2015u3': {
+ '32': 'https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x86.exe',
+ '64': 'https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x64.exe',
+ },
+ '2017': {
+ '32': 'https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe',
+ '64': 'https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe',
+ },
}
NINITE_SOURCES = {
'Bundles': {
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index b41599bb..3d9c2f61 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -21,17 +21,14 @@ if __name__ == '__main__':
print_info('Updating Kit Tools')
## Download ##
- # .bin (Not compressed)
- print_info('\n.bin')
- try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results)
- try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results)
-
# Data Recovery
print_info('\nData Recovery')
try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results)
# Data Transfers
print_info('\nData Transfers')
+ try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results)
+ try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results)
try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results)
# Diagnostics
@@ -42,6 +39,7 @@ if __name__ == '__main__':
try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results)
try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results)
try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results)
+ try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results)
try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results)
# Drivers
@@ -55,6 +53,7 @@ if __name__ == '__main__':
print_info('\nInstallers')
try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results)
try_and_print(message='MS Office...', function=update_office, other_results=other_results)
+ try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results)
print_info('\nNinite')
for section in sorted(NINITE_SOURCES.keys()):
print_success(' {}'.format(section))
@@ -68,7 +67,11 @@ if __name__ == '__main__':
# Misc
print_info('\nMisc')
try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results)
+ try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results)
+ try_and_print(message='Du...', function=update_du, other_results=other_results)
try_and_print(message='Everything...', function=update_everything, other_results=other_results)
+ try_and_print(message='PuTTY...', function=update_putty, other_results=other_results)
+ try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results)
try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results)
try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results)
diff --git a/.gitignore b/.gitignore
index 1476f24d..12624d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@
.cbin/Caffeine/
.cbin/Du/
.cbin/Everything/
+.cbin/FirefoxExtensions/
.cbin/IObitUninstallerPortable/
.cbin/ProduKey/
.cbin/TestDisk/
@@ -31,3 +32,4 @@
.cbin/XYplorerFree/
.cbin/_Drivers/
.cbin/_Office/
+.cbin/_vcredists/
From 6d06371190b1ecd17c6420f5d8a648541132afe8 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Mon, 20 Nov 2017 23:13:39 -0800
Subject: [PATCH 09/20] Updated VCR InstallAll.bat
---
.cbin/_include/_vcredists/InstallAll.bat | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 .cbin/_include/_vcredists/InstallAll.bat
diff --git a/.cbin/_include/_vcredists/InstallAll.bat b/.cbin/_include/_vcredists/InstallAll.bat
new file mode 100644
index 00000000..62211e55
--- /dev/null
+++ b/.cbin/_include/_vcredists/InstallAll.bat
@@ -0,0 +1,22 @@
+@echo off
+setlocal
+
+start "" /wait "2008sp1\x32\vcredist.exe" /qb! /norestart
+start "" /wait "2008sp1\x64\vcredist.exe" /qb! /norestart
+
+start "" /wait "2010\x32\vcredist.exe" /passive /norestart
+start "" /wait "2010\x64\vcredist.exe" /passive /norestart
+
+start "" /wait "2012u4\x32\vcredist.exe" /passive /norestart
+start "" /wait "2012u4\x64\vcredist.exe" /passive /norestart
+
+start "" /wait "2013\x32\vcredist.exe" /install /passive /norestart
+start "" /wait "2013\x64\vcredist.exe" /install /passive /norestart
+
+start "" /wait "2015u3\x32\vcredist.exe" /install /passive /norestart
+start "" /wait "2015u3\x64\vcredist.exe" /install /passive /norestart
+
+start "" /wait "2017\x32\vcredist.exe" /install /passive /norestart
+start "" /wait "2017\x64\vcredist.exe" /install /passive /norestart
+
+endlocal
\ No newline at end of file
From 93a7a69c29ef275b7eff06b337851f4ed6bbc454 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 00:07:41 -0800
Subject: [PATCH 10/20] Compress .cbin done
* Only mildly dangerous?
---
.bin/Scripts/functions/update.py | 32 ++++++++++++++++++++++++
.bin/Scripts/update_kit.py | 43 ++++++++++++++++++++++++--------
.gitignore | 1 +
3 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index ef83f2c5..f219c66c 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -7,6 +7,38 @@ from settings.launchers import *
from settings.music import *
from settings.sources import *
+def compress_and_remove_item(item):
+ try:
+ compress_item(item)
+ except:
+ raise GenericError
+ else:
+ remove_item(item.path)
+
+def compress_item(item):
+ # Prep
+ prev_dir = os.getcwd()
+ dest = '{}.7z'.format(item.path)
+ wd = item.path
+ include_str = '*'
+ if os.path.isfile(wd):
+ wd = os.path.abspath(r'{}\{}'.format(wd, os.path.pardir))
+ include_str = item.name
+ os.chdir(wd)
+
+ # Compress
+ cmd = [
+ global_vars['Tools']['SevenZip'],
+ 'a', dest,
+ '-t7z', '-mx=7', '-myx=7', '-ms=on', '-mhe', '-bso0', '-bse0',
+ '-p{}'.format(ARCHIVE_PASSWORD),
+ include_str,
+ ]
+ run_program(cmd)
+
+ # Done
+ os.chdir(prev_dir)
+
def download_generic(out_dir, out_name, source_url):
"""Downloads a file using requests."""
## Code based on this Q&A: https://stackoverflow.com/q/16694907
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 3d9c2f61..5aa39780 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -18,21 +18,23 @@ if __name__ == '__main__':
}}
stay_awake()
os.system('cls')
- print_info('Updating Kit Tools')
## Download ##
+ print_info('Downloading tools')
+ print_warning('\tSkipped?')
+
# Data Recovery
- print_info('\nData Recovery')
+ print_info(' Data Recovery')
try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results)
# Data Transfers
- print_info('\nData Transfers')
+ print_info(' Data Transfers')
try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results)
try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results)
try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results)
# Diagnostics
- print_info('\nDiagnostics')
+ print_info(' Diagnostics')
try_and_print(message='AIDA64...', function=update_aida64, other_results=other_results)
try_and_print(message='Autoruns...', function=update_autoruns, other_results=other_results)
try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results)
@@ -43,18 +45,18 @@ if __name__ == '__main__':
try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results)
# Drivers
- print_info('\nDrivers')
+ print_info(' Drivers')
try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results)
try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results)
try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results)
try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results)
# Installers
- print_info('\nInstallers')
+ print_info(' Installers')
try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results)
try_and_print(message='MS Office...', function=update_office, other_results=other_results)
try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results)
- print_info('\nNinite')
+ print_info(' Ninite')
for section in sorted(NINITE_SOURCES.keys()):
print_success(' {}'.format(section))
dest = r'{}\_Ninite\{}'.format(global_vars['CBinDir'], section)
@@ -65,7 +67,7 @@ if __name__ == '__main__':
out_dir=dest, out_name=name, source_url=url)
# Misc
- print_info('\nMisc')
+ print_info(' Misc')
try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results)
try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results)
try_and_print(message='Du...', function=update_du, other_results=other_results)
@@ -76,16 +78,37 @@ if __name__ == '__main__':
try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results)
# Repairs
- print_info('\nRepairs')
+ print_info(' Repairs')
try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results)
try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results)
try_and_print(message='RKill...', function=update_rkill, other_results=other_results)
try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results)
# Uninstallers
- print_info('\nUninstallers')
+ print_info(' Uninstallers')
try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results)
+ ## Compress ##
+ print_info('Compressing tools')
+ print_info(' _Drivers')
+ for item in os.scandir(r'{}\_Drivers'.format(global_vars['CBinDir'])):
+ try_and_print(
+ message='{}...'.format(item.name),
+ function=compress_and_remove_item,
+ other_results = other_results,
+ item = item)
+ print_info(' .cbin')
+ for item in os.scandir(global_vars['CBinDir']):
+ if not re.search(r'^_(Drivers|include)$', item.name, re.IGNORECASE):
+ try_and_print(
+ message='{}...'.format(item.name),
+ function=compress_and_remove_item,
+ other_results = other_results,
+ item = item)
+
+ ## Generate Launchers
+ # TODO
+
# Done
print_standard('\nDone.')
pause("Press Enter to exit...")
diff --git a/.gitignore b/.gitignore
index 12624d10..7e2fadb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
.bin/Tmp/
.bin/XMPlay/
.bin/_Drivers/SDIO/
+.cbin/*.7z
.cbin/AIDA64/
.cbin/Autoruns/
.cbin/BleachBit-Portable/
From adef491db0bdee6f7508a7a44340e4249965fd8b Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 00:16:36 -0800
Subject: [PATCH 11/20] Misc Cleanup
* Removed launcher used for testing
---
UPDATEME.cmd | 130 ---------------------------------------------------
1 file changed, 130 deletions(-)
delete mode 100644 UPDATEME.cmd
diff --git a/UPDATEME.cmd b/UPDATEME.cmd
deleted file mode 100644
index 3897f26b..00000000
--- a/UPDATEME.cmd
+++ /dev/null
@@ -1,130 +0,0 @@
-:: Wizard Kit: Launcher Script ::
-::
-:: This script works by setting env variables and then calling Launch.cmd
-:: which inherits the variables. This bypasses batch file argument parsing
-:: which is awful.
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
-call :CheckFlags %*
-call :FindBin
-call :SetTitle Launcher
-
-:Optional
-:: This section is for any work that needs done before launching L_ITEM
-rem EXTRA_CODE_GOES_HERE
-
-:DefineLaunch
-:: Set L_TYPE to one of these options:
-:: Console, Folder, Office, Program, PSScript, or PyScript
-:: Set L_PATH to the path to the program folder
-:: NOTE: Launch.cmd will test for L_PATH in the following order:
-:: 1: %cbin%\L_PATH.7z (which will be extracted to %bin%\L_PATH)
-:: 2: %bin%\L_PATH
-:: 3. %L_PATH% (i.e. treat L_PATH as an absolute path)
-:: Set L_ITEM to one of the following:
-:: 1. The filename of the item to launch
-:: 2. The Office product to install
-:: 3. '.' to open extracted folder
-:: Set L_ARGS to include any necessary arguments (if any)
-:: Set L_7ZIP to include any necessary arguments for extraction
-:: Set L_CHCK to True to have Launch.cmd to stay open if an error is encountered
-:: Set L_ELEV to True to launch with elevated permissions
-:: Set L_NCMD to True to stay in the native console window
-:: Set L_WAIT to True to have the script wait until L_ITEM has comlpeted
-set L_TYPE=PyScript
-set L_PATH=Scripts
-set L_ITEM=update_kit.py
-set L_ARGS=
-set L_7ZIP=
-set L_CHCK=True
-set L_ELEV=
-set L_NCMD=
-set L_WAIT=
-
-:::::::::::::::::::::::::::::::::::::::::::
-:: Do not edit anything below this line! ::
-:::::::::::::::::::::::::::::::::::::::::::
-
-:LaunchPrep
-rem Verifies the environment before launching item
-if not defined bin (goto ErrorNoBin)
-if not exist "%bin%\Scripts\Launch.cmd" (goto ErrorLaunchCMDMissing)
-
-:Launch
-rem Calls the Launch.cmd script using the variables defined above
-call "%bin%\Scripts\Launch.cmd" || goto ErrorLaunchCMD
-goto Exit
-
-:: Functions ::
-:CheckFlags
-rem Loops through all arguments to check for accepted flags
-set DEBUG=
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
-)
-@exit /b 0
-
-:FindBin
-rem Checks the current directory and all parents for the ".bin" folder
-rem NOTE: Has not been tested for UNC paths
-set bin=
-pushd "%~dp0"
-:FindBinInner
-if exist ".bin" (goto FindBinDone)
-if "%~d0\" == "%cd%" (popd & @exit /b 1)
-cd ..
-goto FindBinInner
-:FindBinDone
-set "bin=%cd%\.bin"
-set "cbin=%cd%\.cbin"
-popd
-@exit /b 0
-
-:SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
- set "_v=%%f"
- set "_v=!_v:*'=!"
- set "KIT_NAME_FULL=!_v:~0,-1!"
-)
-set "window_title=%*"
-if not defined window_title set "window_title=Launcher"
-set "window_title=%KIT_NAME_FULL%: %window_title%"
-title %window_title%
-@exit /b 0
-
-:: Errors ::
-:ErrorLaunchCMD
-echo.
-echo ERROR: Launch.cmd did not run correctly. Try using the /DEBUG flag?
-goto Abort
-
-:ErrorLaunchCMDMissing
-echo.
-echo ERROR: Launch.cmd script not found.
-goto Abort
-
-:ErrorNoBin
-echo.
-echo ERROR: ".bin" folder not found.
-goto Abort
-
-:Abort
-color 4e
-echo Aborted.
-echo.
-echo Press any key to exit...
-pause>nul
-color
-rem Set errorlevel to 1 by calling color incorrectly
-color 00
-goto Exit
-
-:: Cleanup and exit ::
-:Exit
-endlocal
-exit /b %errorlevel%
\ No newline at end of file
From b61cb2e0ed96a5351a3d09459531e9ff7687fec5 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 00:33:07 -0800
Subject: [PATCH 12/20] Bugfix and a typo
---
.bin/Scripts/build_kit.ps1 | 2 +-
.bin/Scripts/update_kit.py | 3 +--
.gitignore | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.bin/Scripts/build_kit.ps1 b/.bin/Scripts/build_kit.ps1
index 187cf058..b5c7d7e9 100644
--- a/.bin/Scripts/build_kit.ps1
+++ b/.bin/Scripts/build_kit.ps1
@@ -158,7 +158,7 @@ catch {
## Cleanup ##
Move-Item "$root\Build Kit.cmd" "$bin\Scripts\Build Kit.cmd"
Move-Item "$root\.root_items\*" "$root\"
-New-Item "$root\.cbin"
+New-Item "$root\.cbin" 2> $null
Remove-Item "$root\.root_items"
foreach ($item in @(".bin", ".cbin")) {
if (Test-Path "$root\$item") {
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 5aa39780..a07bb727 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -21,7 +21,6 @@ if __name__ == '__main__':
## Download ##
print_info('Downloading tools')
- print_warning('\tSkipped?')
# Data Recovery
print_info(' Data Recovery')
@@ -61,7 +60,7 @@ if __name__ == '__main__':
print_success(' {}'.format(section))
dest = r'{}\_Ninite\{}'.format(global_vars['CBinDir'], section)
for name, url in sorted(NINITE_SOURCES[section].items()):
- url = 'https://ninite.com/{}/ninite.exe'.format(url)
+ url = 'https://ninite.com/{}/ninite.exe'.format(url)
try_and_print(message=name, function=download_generic,
other_results=other_results,
out_dir=dest, out_name=name, source_url=url)
diff --git a/.gitignore b/.gitignore
index 7e2fadb6..68f9e452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
.cbin/_Drivers/
.cbin/_Office/
.cbin/_vcredists/
+.cbin/wimlib/
From c47d88aad8ec68c4361e135af48fa0d455353936 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 00:37:18 -0800
Subject: [PATCH 13/20] Adjusted formatting for update_kit.py
---
.bin/Scripts/update_kit.py | 68 ++++++++++++++++++++------------------
1 file changed, 35 insertions(+), 33 deletions(-)
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index a07bb727..8febc674 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -24,37 +24,37 @@ if __name__ == '__main__':
# Data Recovery
print_info(' Data Recovery')
- try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results)
+ try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results, width=40)
# Data Transfers
print_info(' Data Transfers')
- try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results)
- try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results)
- try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results)
+ try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results, width=40)
+ try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results, width=40)
+ try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results, width=40)
# Diagnostics
print_info(' Diagnostics')
- try_and_print(message='AIDA64...', function=update_aida64, other_results=other_results)
- try_and_print(message='Autoruns...', function=update_autoruns, other_results=other_results)
- try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results)
- try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results)
- try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results)
- try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results)
- try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results)
- try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results)
+ try_and_print(message='AIDA64...', function=update_aida64, other_results=other_results, width=40)
+ try_and_print(message='Autoruns...', function=update_autoruns, other_results=other_results, width=40)
+ try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results, width=40)
+ try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results, width=40)
+ try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results, width=40)
+ try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results, width=40)
+ try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results, width=40)
+ try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results, width=40)
# Drivers
print_info(' Drivers')
- try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results)
- try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results)
- try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results)
- try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results)
+ try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results, width=40)
+ try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results, width=40)
+ try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results, width=40)
+ try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results, width=40)
# Installers
print_info(' Installers')
- try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results)
- try_and_print(message='MS Office...', function=update_office, other_results=other_results)
- try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results)
+ try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results, width=40)
+ try_and_print(message='MS Office...', function=update_office, other_results=other_results, width=40)
+ try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results, width=40)
print_info(' Ninite')
for section in sorted(NINITE_SOURCES.keys()):
print_success(' {}'.format(section))
@@ -62,30 +62,30 @@ if __name__ == '__main__':
for name, url in sorted(NINITE_SOURCES[section].items()):
url = 'https://ninite.com/{}/ninite.exe'.format(url)
try_and_print(message=name, function=download_generic,
- other_results=other_results,
+ other_results=other_results, width=40,
out_dir=dest, out_name=name, source_url=url)
# Misc
print_info(' Misc')
- try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results)
- try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results)
- try_and_print(message='Du...', function=update_du, other_results=other_results)
- try_and_print(message='Everything...', function=update_everything, other_results=other_results)
- try_and_print(message='PuTTY...', function=update_putty, other_results=other_results)
- try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results)
- try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results)
- try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results)
+ try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results, width=40)
+ try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results, width=40)
+ try_and_print(message='Du...', function=update_du, other_results=other_results, width=40)
+ try_and_print(message='Everything...', function=update_everything, other_results=other_results, width=40)
+ try_and_print(message='PuTTY...', function=update_putty, other_results=other_results, width=40)
+ try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results, width=40)
+ try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results, width=40)
+ try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results, width=40)
# Repairs
print_info(' Repairs')
- try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results)
- try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results)
- try_and_print(message='RKill...', function=update_rkill, other_results=other_results)
- try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results)
+ try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results, width=40)
+ try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results, width=40)
+ try_and_print(message='RKill...', function=update_rkill, other_results=other_results, width=40)
+ try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results, width=40)
# Uninstallers
print_info(' Uninstallers')
- try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results)
+ try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results, width=40)
## Compress ##
print_info('Compressing tools')
@@ -95,6 +95,7 @@ if __name__ == '__main__':
message='{}...'.format(item.name),
function=compress_and_remove_item,
other_results = other_results,
+ width=40,
item = item)
print_info(' .cbin')
for item in os.scandir(global_vars['CBinDir']):
@@ -103,6 +104,7 @@ if __name__ == '__main__':
message='{}...'.format(item.name),
function=compress_and_remove_item,
other_results = other_results,
+ width=40,
item = item)
## Generate Launchers
From 52684ebb4a4eb0f8564cd3cb6784846440b0c5c3 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 10:34:52 -0800
Subject: [PATCH 14/20] Bugfix
* TreeSizeFree downloads and extracts correctly again
* Compressing tools will skip 7-Zip archives
---
.bin/Scripts/functions/update.py | 1 -
.bin/Scripts/update_kit.py | 25 +++++++++++++++----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index f219c66c..7dcc590f 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -661,7 +661,6 @@ def update_treesizefree():
# Extract files
## NOTE: When downloaded using requests it is a .zip.gz?
source = r'{}\treesizefree.zip.gz'.format(global_vars['TmpDir'])
- download_to_temp(name, url)
extract_generic(source, global_vars['TmpDir'])
extract_temp_to_cbin('treesizefree.zip', 'TreeSizeFree-Portable')
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 8febc674..7491b6fd 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -20,7 +20,7 @@ if __name__ == '__main__':
os.system('cls')
## Download ##
- print_info('Downloading tools')
+ print_success('Downloading tools')
# Data Recovery
print_info(' Data Recovery')
@@ -57,7 +57,7 @@ if __name__ == '__main__':
try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results, width=40)
print_info(' Ninite')
for section in sorted(NINITE_SOURCES.keys()):
- print_success(' {}'.format(section))
+ print_success(' {}'.format(section))
dest = r'{}\_Ninite\{}'.format(global_vars['CBinDir'], section)
for name, url in sorted(NINITE_SOURCES[section].items()):
url = 'https://ninite.com/{}/ninite.exe'.format(url)
@@ -87,19 +87,24 @@ if __name__ == '__main__':
print_info(' Uninstallers')
try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results, width=40)
+ ## Review ##
+ print_standard('Please review the results and download/extract any missing items to .cbin')
+ pause('Press Enter to compress the .cbin items')
+
## Compress ##
- print_info('Compressing tools')
+ print_success('Compressing tools')
print_info(' _Drivers')
for item in os.scandir(r'{}\_Drivers'.format(global_vars['CBinDir'])):
- try_and_print(
- message='{}...'.format(item.name),
- function=compress_and_remove_item,
- other_results = other_results,
- width=40,
- item = item)
+ if not re.search(r'^(_Drivers|.*7z)$', item.name, re.IGNORECASE):
+ try_and_print(
+ message='{}...'.format(item.name),
+ function=compress_and_remove_item,
+ other_results = other_results,
+ width=40,
+ item = item)
print_info(' .cbin')
for item in os.scandir(global_vars['CBinDir']):
- if not re.search(r'^_(Drivers|include)$', item.name, re.IGNORECASE):
+ if not re.search(r'^(_Drivers|_include|.*7z)$', item.name, re.IGNORECASE):
try_and_print(
message='{}...'.format(item.name),
function=compress_and_remove_item,
From 830eff27c39c0a5d702294e874eab23363249759 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 10:59:57 -0800
Subject: [PATCH 15/20] Build kit in new folder
---
.bin/Scripts/build_kit.ps1 | 11 -----------
.gitignore | 1 +
Build Kit.cmd | 13 +++++++++++--
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/.bin/Scripts/build_kit.ps1 b/.bin/Scripts/build_kit.ps1
index b5c7d7e9..bf38abc8 100644
--- a/.bin/Scripts/build_kit.ps1
+++ b/.bin/Scripts/build_kit.ps1
@@ -155,17 +155,6 @@ catch {
Write-Host (" ERROR: Failed to extract files." ) -foregroundcolor "Red"
}
-## Cleanup ##
-Move-Item "$root\Build Kit.cmd" "$bin\Scripts\Build Kit.cmd"
-Move-Item "$root\.root_items\*" "$root\"
-New-Item "$root\.cbin" 2> $null
-Remove-Item "$root\.root_items"
-foreach ($item in @(".bin", ".cbin")) {
- if (Test-Path "$root\$item") {
- (Get-Item "$root\$item").attributes = "Hidden"
- }
-}
-
## Configure ##
Write-Host "Configuring kit"
wk_pause "Press Enter to open settings..."
diff --git a/.gitignore b/.gitignore
index 68f9e452..fb551c93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
.cbin/_Office/
.cbin/_vcredists/
.cbin/wimlib/
+OUT/
diff --git a/Build Kit.cmd b/Build Kit.cmd
index 4a81d71b..b16a60cd 100644
--- a/Build Kit.cmd
+++ b/Build Kit.cmd
@@ -4,16 +4,25 @@
:Init
setlocal
-call :CheckFlags %*
title Wizard Kit: Build Tool
+call :CheckFlags %*
:LaunchPrep
rem Verifies the environment before launching item
if not exist ".bin\Scripts\build_kit.ps1" (goto ErrorBuildKitMissing)
+:PrepNewKit
+rem Copy base files to a new folder OUT\%KIT_NAME_FULL%
+robocopy /e . OUT /xd .git .root_items OUT /xf .gitignore "Build Kit.cmd"
+robocopy /e .root_items OUT
+mkdir OUT\.cbin >nul 2>&1
+attrib +h OUT\.bin >nul 2>&1
+attrib +h OUT\.cbin >nul 2>&1
+
:Launch
rem Calls the Launch.cmd script using the variables defined above
-powershell -executionpolicy bypass -noprofile -file .bin\Scripts\build_kit.ps1 || goto ErrorUnknown
+set "file=OUT\.bin\Scripts\build_kit.ps1"
+powershell -executionpolicy bypass -noprofile -file %file% || goto ErrorUnknown
goto Exit
:: Functions ::
From d0f4dd1f5287fa0bd0b39b3040bafa36b4173f7f Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 13:25:44 -0800
Subject: [PATCH 16/20] Made SDIO Update optional
---
.bin/Scripts/update_kit.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 7491b6fd..4ce18a7e 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -18,6 +18,10 @@ if __name__ == '__main__':
}}
stay_awake()
os.system('cls')
+ print_info('Starting {} Full Update\n'.format(KIT_NAME_FULL))
+
+ ## Prep ##
+ update_sdio = ask('Update SDI Origin?')
## Download ##
print_success('Downloading tools')
@@ -48,7 +52,8 @@ if __name__ == '__main__':
try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results, width=40)
try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results, width=40)
try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results, width=40)
- try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results, width=40)
+ if update_sdio:
+ try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results, width=40)
# Installers
print_info(' Installers')
From deac1a6ddaa52343922fcfbed0e2caaf9869cda2 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 13:26:33 -0800
Subject: [PATCH 17/20] Completed generate launchers
---
.bin/Scripts/Launcher_Template.cmd | 2 +-
.bin/Scripts/functions/update.py | 35 ++++++++++++++++++++++++++++++
.bin/Scripts/update_kit.py | 8 ++++++-
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/.bin/Scripts/Launcher_Template.cmd b/.bin/Scripts/Launcher_Template.cmd
index 488f5800..c7078e1c 100644
--- a/.bin/Scripts/Launcher_Template.cmd
+++ b/.bin/Scripts/Launcher_Template.cmd
@@ -14,7 +14,7 @@ call :SetTitle Launcher
:Optional
:: This section is for any work that needs done before launching L_ITEM
-rem EXTRA_CODE_GOES_HERE
+rem EXTRA_CODE
:DefineLaunch
:: Set L_TYPE to one of these options:
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 7dcc590f..cf3d4e3e 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -81,6 +81,41 @@ def extract_temp_to_cbin(source, item, mode='x', sz_args=[]):
shutil.copytree(include_path, dest)
extract_generic(source, dest, mode, sz_args)
+def generate_launcher(section, name, options):
+ # Prep
+ dest = r'{}\{}'.format(global_vars['BaseDir'], section)
+ if section == '(Root)':
+ dest = global_vars['BaseDir']
+ full_path = r'{}\{}.cmd'.format(dest, name)
+ template = r'{}\Scripts\Launcher_Template.cmd'.format(global_vars['BinDir'])
+
+ # Format options
+ f_options = {}
+ for opt in options.keys():
+ if opt == 'Extra Code':
+ f_options['rem EXTRA_CODE'] = '{}\n'.format(
+ '\n'.join(options['Extra Code']))
+ elif re.search(r'^L_\w+', opt, re.IGNORECASE):
+ new_opt = 'set {}='.format(opt)
+ f_options[new_opt] = 'set {}={}\n'.format(opt, options[opt])
+
+ # Remove existing launcher
+ os.makedirs(dest, exist_ok=True)
+ if os.path.exists(full_path):
+ remove_item(full_path)
+ sleep(1)
+
+ # Read template and update using f_options
+ out_text = []
+ with open(template, 'r') as f:
+ for line in f.readlines():
+ if line.strip() in f_options:
+ out_text.append(f_options[line.strip()])
+ else:
+ out_text.append(line)
+ with open(full_path, 'w') as f:
+ f.writelines(out_text)
+
def remove_item(item_path):
if os.path.exists(item_path):
if os.path.isdir(item_path):
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 4ce18a7e..3f5cc069 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -118,7 +118,13 @@ if __name__ == '__main__':
item = item)
## Generate Launchers
- # TODO
+ print_success('Generating launchers')
+ for section in sorted(LAUNCHERS.keys()):
+ print_info(' {}'.format(section))
+ for name, options in sorted(LAUNCHERS[section].items()):
+ try_and_print(message=name, function=generate_launcher,
+ section=section, name=name, options=options,
+ other_results=other_results, width=40)
# Done
print_standard('\nDone.')
From 65d710b72f74142de009cd109b85d27f8a2ee2c0 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 13:31:20 -0800
Subject: [PATCH 18/20] Trimmed settings.launchers
---
.bin/Scripts/settings/launchers.py | 232 ++---------------------------
1 file changed, 14 insertions(+), 218 deletions(-)
diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py
index a698fb1b..928452c0 100644
--- a/.bin/Scripts/settings/launchers.py
+++ b/.bin/Scripts/settings/launchers.py
@@ -1,14 +1,13 @@
# Wizard Kit: Settings - Launchers
LAUNCHERS = {
- '/': {
+ r'(Root)': {
'Activate Windows': {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'activate.py',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
},
'Enter SafeMode': {
'L_TYPE': 'PyScript',
@@ -16,7 +15,6 @@ LAUNCHERS = {
'L_ITEM': 'safemode_enter.py',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
},
'Exit SafeMode': {
'L_TYPE': 'PyScript',
@@ -24,7 +22,6 @@ LAUNCHERS = {
'L_ITEM': 'safemode_exit.py',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
},
'System Checklist': {
'L_TYPE': 'PyScript',
@@ -32,7 +29,6 @@ LAUNCHERS = {
'L_ITEM': 'system_checklist.py',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
},
'System Diagnostics': {
'L_TYPE': 'PyScript',
@@ -40,52 +36,39 @@ LAUNCHERS = {
'L_ITEM': 'system_diagnostics.py',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
},
'User Checklist': {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'user_checklist.py',
'L_CHCK': 'True',
- 'L_NCMD': '',
},
},
- '/Data Recovery': {
+ r'Data Recovery': {
'PhotoRec (CLI)': {
'L_TYPE': 'Console',
'L_PATH': 'TestDisk',
'L_ITEM': 'photorec_win.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'PhotoRec': {
'L_TYPE': 'Program',
'L_PATH': 'TestDisk',
'L_ITEM': 'qphotorec_win.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'TestDisk': {
'L_TYPE': 'Console',
'L_PATH': 'TestDisk',
'L_ITEM': 'testdisk_win.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
},
- '/Data Transfers': {
+ r'Data Transfers': {
'FastCopy (as ADMIN)': {
'L_TYPE': 'Program',
'L_PATH': 'FastCopy',
@@ -129,11 +112,9 @@ LAUNCHERS = {
r'Thumbs.db'
r' /to=%client_dir%\Transfer_%iso_date%\ '
),
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'call "%bin%\Scripts\init_client_dir.cmd" /Info /Transfer',
],
@@ -181,11 +162,8 @@ LAUNCHERS = {
r'Thumbs.db'
r' /to=%client_dir%\Transfer_%iso_date%\ '
),
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'call "%bin%\Scripts\init_client_dir.cmd" /Info /Transfer',
],
@@ -201,11 +179,8 @@ LAUNCHERS = {
r' -dontcryptsupportinfo'
r' -fixednames'
),
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
r'set "q_dir=%client_dir%\Quarantine\KVRT"',
@@ -216,58 +191,41 @@ LAUNCHERS = {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'transferred_keys.py',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'User Data Transfer': {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'user_data_transfer.py',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'XYplorer (as ADMIN)': {
'L_TYPE': 'Program',
'L_PATH': 'XYplorerFree',
'L_ITEM': 'XYplorerFree.exe',
'L_ARGS': r'/exp /win=max %userprofile%',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'XYplorer': {
'L_TYPE': 'Program',
'L_PATH': 'XYplorerFree',
'L_ITEM': 'XYplorerFree.exe',
'L_ARGS': r'/exp /win=max %userprofile%',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
},
- '/Diagnostics': {
+ r'Diagnostics': {
'HWiNFO': {
'L_TYPE': 'Program',
'L_PATH': 'HWiNFO',
'L_ITEM': 'HWiNFO.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'for %%a in (32 64) do (',
r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
@@ -280,12 +238,9 @@ LAUNCHERS = {
'L_TYPE': 'Program',
'L_PATH': 'ProduKey',
'L_ITEM': 'ProduKey.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'if exist "%bin%\ProduKey" (',
r' del "%bin%\ProduKey\ProduKey.cfg" 2>nul',
@@ -294,28 +249,21 @@ LAUNCHERS = {
],
},
},
- '/Diagnostics/Extras': {
+ r'Diagnostics\Extras': {
'AIDA64': {
'L_TYPE': 'Program',
'L_PATH': 'AIDA64',
'L_ITEM': 'aida64.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Autoruns (with VirusTotal Scan)': {
'L_TYPE': 'Program',
'L_PATH': 'Autoruns',
'L_ITEM': 'Autoruns.exe',
'L_ARGS': '-e',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 1 /f >nul',
r'reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
@@ -333,48 +281,33 @@ LAUNCHERS = {
'L_TYPE': 'Program',
'L_PATH': 'BleachBit',
'L_ITEM': 'bleachbit.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'BlueScreenView': {
'L_TYPE': 'Program',
'L_PATH': 'BlueScreenView',
'L_ITEM': 'BlueScreenView.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'ERUNT': {
'L_TYPE': 'Program',
'L_PATH': 'erunt',
'L_ITEM': 'ERUNT.EXE',
'L_ARGS': '%log_dir%\Registry sysreg curuser otherusers',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'call "%bin%\Scripts\init_client_dir.cmd" /Info',
],
},
'HitmanPro': {
'L_TYPE': 'Program',
- 'L_PATH': '',
- 'L_ITEM': '',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'call "%bin%\Scripts\init_client_dir.cmd" /Info',
],
@@ -383,12 +316,8 @@ LAUNCHERS = {
'L_TYPE': 'Program',
'L_PATH': 'HWiNFO',
'L_ITEM': 'HWiNFO.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'for %%a in (32 64) do (',
r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
@@ -398,74 +327,51 @@ LAUNCHERS = {
],
},
},
- '/Drivers': {
+ r'Drivers': {
'Intel RST (Current Release)': {
'L_TYPE': 'Program',
'L_PATH': '_Drivers\Intel RST',
'L_ITEM': 'SetupRST_15.8.exe',
- 'L_ARGS': '',
'L_7ZIP': 'SetupRST_15.8.exe',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Intel RST (Previous Releases)': {
'L_TYPE': 'Folder',
'L_PATH': '_Drivers\Intel RST',
'L_ITEM': '.',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Intel SSD Toolbox': {
'L_TYPE': 'Program',
'L_PATH': '_Drivers',
'L_ITEM': 'Intel SSD Toolbox.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Samsing Magician': {
'L_TYPE': 'Program',
'L_PATH': '_Drivers',
'L_ITEM': 'Samsung Magician.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Snappy Driver Installer Origin': {
'L_TYPE': 'Program',
'L_PATH': '_Drivers\SDIO',
'L_ITEM': 'SDIO.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
},
- '/Drivers/Extras': {
+ r'Drivers\Extras': {
'Acer': {
'L_TYPE': 'Program',
'L_PATH': 'HWiNFO',
'L_ITEM': 'HWiNFO.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'for %%a in (32 64) do (',
r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
@@ -479,12 +385,8 @@ LAUNCHERS = {
'L_TYPE': 'Program',
'L_PATH': 'HWiNFO',
'L_ITEM': 'HWiNFO.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'for %%a in (32 64) do (',
r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
@@ -498,12 +400,8 @@ LAUNCHERS = {
'L_TYPE': 'Program',
'L_PATH': 'HWiNFO',
'L_ITEM': 'HWiNFO.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'for %%a in (32 64) do (',
r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
@@ -514,224 +412,148 @@ LAUNCHERS = {
],
},
},
- '/Installers': {
+ r'Installers': {
'SW Bundle': {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'install_sw_bundle.py',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
},
- '/Installers/Extras/Office/2013': {
+ r'Installers\Extras\Office\2013': {
'Home and Business 2013 (x32)': {
'L_TYPE': 'Office',
'L_PATH': '2013',
'L_ITEM': 'hb_32.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'Home and Business 2013 (x64)': {
'L_TYPE': 'Office',
'L_PATH': '2013',
'L_ITEM': 'hb_64.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'Home and Student 2013 (x32)': {
'L_TYPE': 'Office',
'L_PATH': '2013',
'L_ITEM': 'hs_32.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'Home and Student 2013 (x64)': {
'L_TYPE': 'Office',
'L_PATH': '2013',
'L_ITEM': 'hs_64.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
},
- '/Installers/Extras/Office/2016': {
+ r'Installers\Extras\Office\2016': {
'Home and Business 2016 (x32)': {
'L_TYPE': 'Office',
'L_PATH': '2016',
'L_ITEM': 'hb_32.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'Home and Business 2016 (x64)': {
'L_TYPE': 'Office',
'L_PATH': '2016',
'L_ITEM': 'hb_64.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'Home and Student 2016 (x32)': {
'L_TYPE': 'Office',
'L_PATH': '2016',
'L_ITEM': 'hs_32.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'Home and Student 2016 (x64)': {
'L_TYPE': 'Office',
'L_PATH': '2016',
'L_ITEM': 'hs_64.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'Office 365 2016 (x32)': {
'L_TYPE': 'Office',
'L_PATH': '2016',
'L_ITEM': '365_32.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'Office 365 2016 (x64)': {
'L_TYPE': 'Office',
'L_PATH': '2016',
'L_ITEM': '365_64.xml',
- 'L_ARGS': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
},
- '/Misc': {
+ r'Misc': {
'ConEmu (as ADMIN)': {
'L_TYPE': 'Program',
'L_PATH': 'ConEmu',
'L_ITEM': 'ConEmu.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'ConEmu': {
'L_TYPE': 'Program',
'L_PATH': 'ConEmu',
'L_ITEM': 'ConEmu.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Everything': {
'L_TYPE': 'Program',
'L_PATH': 'Everything',
'L_ITEM': 'Everything.exe',
'L_ARGS': '-nodb',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Notepad++': {
'L_TYPE': 'Program',
'L_PATH': 'notepadplusplus',
'L_ITEM': 'notepadplusplus.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'PuTTY': {
'L_TYPE': 'Program',
'L_PATH': 'PuTTY',
'L_ITEM': 'PUTTY.EXE',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'TreeSizeFree-Portable': {
'L_TYPE': 'Program',
'L_PATH': 'TreeSizeFree',
'L_ITEM': 'TreeSizeFree.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Update Kit': {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'update_kit.py',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'XMPlay': {
'L_TYPE': 'Program',
'L_PATH': 'XMPlay',
'L_ITEM': 'xmplay.exe',
'L_ARGS': '"%bin%\XMPlay\music.7z"',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
},
- '/Repairs': {
+ r'Repairs': {
'AdwCleaner': {
'L_TYPE': 'Program',
'L_PATH': 'AdwCleaner',
'L_ITEM': 'AdwCleaner.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'Autoruns': {
'L_TYPE': 'Program',
@@ -740,9 +562,7 @@ LAUNCHERS = {
'L_ARGS': '-e',
'L_7ZIP': 'Autoruns*',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 0 /f >nul',
r'reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
@@ -760,23 +580,16 @@ LAUNCHERS = {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'check_disk.py',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
- 'L_NCMD': '',
- 'L_WAIT': '',
},
'DISM': {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'dism.py',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'TRUE',
- 'L_WAIT': '',
},
'KVRT': {
'L_TYPE': 'Program',
@@ -789,11 +602,8 @@ LAUNCHERS = {
r' -dontcryptsupportinfo'
r' -fixednames'
),
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
r'set "q_dir=%client_dir%\Quarantine\KVRT"',
@@ -804,12 +614,8 @@ LAUNCHERS = {
'L_TYPE': 'Program',
'L_PATH': 'RKill',
'L_ITEM': 'RKill.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'call "%bin%\Scripts\init_client_dir.cmd" /Info',
],
@@ -818,12 +624,9 @@ LAUNCHERS = {
'L_TYPE': 'PyScript',
'L_PATH': 'Scripts',
'L_ITEM': 'sfc_scan.py',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
'L_ELEV': 'True',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
'TDSSKiller': {
'L_TYPE': 'Program',
@@ -837,11 +640,8 @@ LAUNCHERS = {
r' -dcexact'
r' -tdlfs'
),
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
'Extra Code': [
r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
r'set "q_dir=%client_dir%\Quarantine\TDSSKiller"',
@@ -849,20 +649,16 @@ LAUNCHERS = {
],
},
},
- '/Uninstallers': {
+ r'Uninstallers': {
'IObit Uninstaller': {
'L_TYPE': 'Program',
'L_PATH': 'IObitUninstallerPortable',
'L_ITEM': 'IObitUninstallerPortable.exe',
- 'L_ARGS': '',
- 'L_7ZIP': '',
'L_CHCK': 'True',
- 'L_ELEV': '',
'L_NCMD': 'True',
- 'L_WAIT': '',
},
},
- },
+ }
if __name__ == '__main__':
print("This file is not meant to be called directly.")
From 4701ef77fd80831bdca9f328708fbeba810a7ef6 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 15:00:20 -0800
Subject: [PATCH 19/20] Readded network installers
* Only installers for supported years have launchers created
---
.bin/Scripts/Launch.cmd | 55 +++++++++++++++++++-------
.bin/Scripts/functions/data.py | 67 +++++++++++++++++++-------------
.bin/Scripts/functions/update.py | 24 ++++++++++++
.bin/Scripts/settings/main.py | 16 ++++----
.bin/Scripts/update_kit.py | 5 +++
.gitignore | 3 +-
6 files changed, 120 insertions(+), 50 deletions(-)
diff --git a/.bin/Scripts/Launch.cmd b/.bin/Scripts/Launch.cmd
index 6b95c37a..efcc37f7 100644
--- a/.bin/Scripts/Launch.cmd
+++ b/.bin/Scripts/Launch.cmd
@@ -121,19 +121,48 @@ rem set args and copy setup files to system
rem NOTE: init_client_dir.cmd sets %client_dir% and creates %client_dir%\Office folder
call "%bin%\Scripts\init_client_dir.cmd" /Office
echo Copying setup file(s) for %L_ITEM%...
-rem extract setup/xml and start installation
-set "setup=%L_PATH%\setup.exe"
-set "dest=%client_dir%\Office\%L_PATH%"
-"%SEVEN_ZIP%" e "%cbin%\_Office.7z" -aoa -bso0 -bse0 -p%ARCHIVE_PASSWORD% -o"!dest!" !setup! !L_ITEM! || exit /b 1
-"%systemroot%\System32\ping.exe" -n 2 127.0.0.1>nul
-if not exist "!dest!\setup.exe" (goto ErrorOfficeSourceNotFound)
-if not exist "!dest!\!L_ITEM!" (goto ErrorOfficeSourceNotFound)
-pushd "!dest!"
-rem # The line below jumps to ErrorUnknown even though setup.exe is run correctly??
-rem start "" "setup.exe" /configure !L_ITEM! || popd & goto ErrorUnknown
-rem # Going to assume it extracted correctly and blindly start setup.exe
-start "" "setup.exe" /configure !L_ITEM!
-popd
+rem NOTE: If L_PATH == "2013" or "2016" extract the ODT setup/xml, otherwise copy from OFFICE_SERVER
+set "_odt=False"
+if %L_PATH% equ 2013 (set "_odt=True")
+if %L_PATH% equ 2016 (set "_odt=True")
+if "%_odt%" == "True" (
+ rem extract setup/xml and start installation
+ set "source=%L_PATH%\setup.exe"
+ set "dest=%client_dir%\Office\%L_PATH%"
+ "%SEVEN_ZIP%" e "%cbin%\_Office.7z" -aoa -bso0 -bse0 -p%ARCHIVE_PASSWORD% -o"!dest!" !source! !L_ITEM! || exit /b 1
+ "%systemroot%\System32\ping.exe" -n 2 127.0.0.1>nul
+ if not exist "!dest!\setup.exe" (goto ErrorOfficeSourceNotFound)
+ if not exist "!dest!\!L_ITEM!" (goto ErrorOfficeSourceNotFound)
+ pushd "!dest!"
+ rem # The line below jumps to ErrorUnknown even though setup.exe is run correctly??
+ rem start "" "setup.exe" /configure !L_ITEM! || popd & goto ErrorUnknown
+ rem # Going to assume it extracted correctly and blindly start setup.exe
+ start "" "setup.exe" /configure !L_ITEM!
+ popd
+) else (
+ rem copy setup files from OFFICE_SERVER
+ set "fastcopy_args=/cmd=diff /no_ui /auto_close"
+ set "product=%L_PATH%\%L_ITEM%"
+ set "product_name=%L_ITEM%"
+ call :GetBasename product_name || goto ErrorBasename
+ set "source=\\%OFFICE_SERVER%\Office\!product!"
+ set "dest=%client_dir%\Office"
+ rem Verify source
+ if not exist "!source!" (goto ErrorOfficeSourceNotFound)
+ rem Copy setup file(s) to system
+ start "" /wait "%FASTCOPY%" !fastcopy_args! "!source!" /to="!dest!\"
+ rem Run setup
+ if exist "!dest!\!product_name!\setup.exe" (
+ start "" "!dest!\!product_name!\setup.exe" || goto ErrorUnknown
+ ) else if "!product_name:~-3,3!" == "exe" (
+ start "" "!dest!\!product_name!" || goto ErrorUnknown
+ ) else if "!product_name:~-3,3!" == "msi" (
+ start "" "!dest!\!product_name!" || goto ErrorUnknown
+ ) else (
+ rem Office source not supported by this script
+ goto ErrorOfficeUnsupported
+ )
+)
goto Exit
:LaunchQuickBooksSetup
diff --git a/.bin/Scripts/functions/data.py b/.bin/Scripts/functions/data.py
index 62cc7b4d..fa324df5 100644
--- a/.bin/Scripts/functions/data.py
+++ b/.bin/Scripts/functions/data.py
@@ -164,28 +164,33 @@ def mount_backup_shares():
if server['Mounted']:
continue
- # Else, test connection
- try:
- ping(server['IP'])
- except subprocess.CalledProcessError:
- print_error(
- r'Failed to mount \\{Name}\{Share}, {IP} unreachable.'.format(
- **server))
- sleep(1)
- continue # Continue to next server
+ mount_network_share(server)
+
- # Mount
- cmd = r'net use \\{IP}\{Share} /user:{User} {Pass}'.format(**server)
- cmd = cmd.split(' ')
- try:
- run_program(cmd)
- except Exception:
- print_warning(r'Failed to mount \\{Name}\{Share} ({IP})'.format(
+def mount_network_share(server):
+ """Mount a network share defined by server."""
+ # Test connection
+ try:
+ ping(server['IP'])
+ except subprocess.CalledProcessError:
+ print_error(
+ r'Failed to mount \\{Name}\{Share}, {IP} unreachable.'.format(
**server))
- sleep(1)
- else:
- print_info('Mounted {Name}'.format(**server))
- server['Mounted'] = True
+ sleep(1)
+ return False
+
+ # Mount
+ cmd = r'net use \\{IP}\{Share} /user:{User} {Pass}'.format(**server)
+ cmd = cmd.split(' ')
+ try:
+ run_program(cmd)
+ except Exception:
+ print_warning(r'Failed to mount \\{Name}\{Share} ({IP})'.format(
+ **server))
+ sleep(1)
+ else:
+ print_info('Mounted {Name}'.format(**server))
+ server['Mounted'] = True
def run_fast_copy(items, dest):
"""Copy items to dest using FastCopy."""
@@ -560,14 +565,20 @@ def transfer_source(source_obj, dest_path, selected_items):
def umount_backup_shares():
"""Unnount the backup shares regardless of current status."""
for server in BACKUP_SERVERS:
- try:
- # Umount
- run_program(r'net use \\{IP}\{Share} /delete'.format(**server))
- print_info('Umounted {Name}'.format(**server))
- server['Mounted'] = False
- except Exception:
- print_error(r'Failed to umount \\{Name}\{Share}.'.format(**server))
- sleep(1)
+ umount_network_share(server)
+
+def umount_network_share(server):
+ """Unnount a network share defined by server."""
+ cmd = r'net use \\{IP}\{Share} /delete'.format(**server)
+ cmd = cmd.split(' ')
+ try:
+ run_program(cmd)
+ except Exception:
+ print_error(r'Failed to umount \\{Name}\{Share}.'.format(**server))
+ sleep(1)
+ else:
+ print_info('Umounted {Name}'.format(**server))
+ server['Mounted'] = False
def wim_contains(source_path, file_path):
"""Check if the WIM contains a file or folder."""
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index cf3d4e3e..2f3474e1 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -3,6 +3,7 @@
import requests
from functions.common import *
+from functions.data import *
from settings.launchers import *
from settings.music import *
from settings.sources import *
@@ -156,6 +157,29 @@ def resolve_dynamic_url(source_url, regex):
# Return
return url
+def scan_for_net_installers(server, family_name, min_year):
+ if not server['Mounted']:
+ mount_network_share(server)
+
+ if server['Mounted']:
+ for year in os.scandir(r'\\{IP}\{Share}'.format(**server)):
+ if int(year.name) < min_year:
+ # Don't support outdated installers
+ continue
+ for version in os.scandir(year.path):
+ section = r'Installers\Extras\{}\{}'.format(
+ family_name, year.name)
+ if section not in LAUNCHERS:
+ LAUNCHERS[section] = {}
+ if version.name not in LAUNCHERS[section]:
+ LAUNCHERS[section][version.name] = {
+ 'L_TYPE': family_name,
+ 'L_PATH': year.name,
+ 'L_ITEM': version.name,
+ 'L_CHCK': 'True',
+ }
+ umount_network_share(server)
+
## Data Recovery ##
def update_testdisk():
# Stop running processes
diff --git a/.bin/Scripts/settings/main.py b/.bin/Scripts/settings/main.py
index d797f9c1..e8c828d4 100644
--- a/.bin/Scripts/settings/main.py
+++ b/.bin/Scripts/settings/main.py
@@ -39,14 +39,6 @@ CLIENT_INFO_SERVER = {
'Share': '/srv/ClientInfo',
'User': 'upload',
}
-QUICKBOOKS_SERVER = {
- 'IP': QUICKBOOKS_SERVER_IP,
- 'Name': 'ServerOne',
- 'Mounted': False,
- 'Share': 'QuickBooks',
- 'User': 'restore',
- 'Pass': 'Abracadabra',
-}
OFFICE_SERVER = {
'IP': OFFICE_SERVER_IP,
'Name': 'ServerOne',
@@ -55,6 +47,14 @@ OFFICE_SERVER = {
'User': 'restore',
'Pass': 'Abracadabra',
}
+QUICKBOOKS_SERVER = {
+ 'IP': QUICKBOOKS_SERVER_IP,
+ 'Name': 'ServerOne',
+ 'Mounted': False,
+ 'Share': 'QuickBooks',
+ 'User': 'restore',
+ 'Pass': 'Abracadabra',
+}
WINDOWS_SERVER = {
'IP': '10.0.0.10',
'Name': 'ServerOne',
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 3f5cc069..9aee428a 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -117,6 +117,11 @@ if __name__ == '__main__':
width=40,
item = item)
+ ## Search for network Office/QuickBooks installers & add to LAUNCHERS
+ print_success('Scanning for network installers')
+ scan_for_net_installers(OFFICE_SERVER, 'Office', min_year=2010)
+ scan_for_net_installers(QUICKBOOKS_SERVER, 'QuickBooks', min_year=2015)
+
## Generate Launchers
print_success('Generating launchers')
for section in sorted(LAUNCHERS.keys()):
diff --git a/.gitignore b/.gitignore
index fb551c93..460518a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
**/__pycache__/*
+*.bak
*.exe
.bin/7-Zip/
.bin/AIDA64/
@@ -35,4 +36,4 @@
.cbin/_Office/
.cbin/_vcredists/
.cbin/wimlib/
-OUT/
+OUT*/
From 4bdab51e342ac34002cec31aaba1403ef935c063 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 21 Nov 2017 15:00:49 -0800
Subject: [PATCH 20/20] Reduce wait time after removing old launchers
---
.bin/Scripts/functions/update.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 2f3474e1..0f71a393 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -104,7 +104,7 @@ def generate_launcher(section, name, options):
os.makedirs(dest, exist_ok=True)
if os.path.exists(full_path):
remove_item(full_path)
- sleep(1)
+ sleep(0.25)
# Read template and update using f_options
out_text = []