From d9dddebccbf2a8403e1c8d1436719e60bc827a43 Mon Sep 17 00:00:00 2001 From: Alan Mason <@2Shirt> Date: Fri, 17 Nov 2017 00:51:54 -0700 Subject: [PATCH] 2016-09: Retroactive Updates Major .bin and extraction code overhaul * All .cmd files now have code for searching the for the .bin folder * This starts at the script's parent folder and moves upward * If no .bin folder is found then print an error to the screen * 7z has been replaced with 7za * This is for better handling of x32/x64 usage * This also fixed a few bugs with extracting ProduKey/MailPassView/etc * We no longer require the full power of 7z.exe/7z.dll * (Since wimlib-imagex will probably be used for WIM files soon-ish) * Bugfixes * A few calls of pushd were unsafe (without quotes) * SFC scan no longer closes immediately --- .bin/Scripts/Launch.cmd | 10 ++-- .bin/Scripts/activate.ps1 | 19 +++---- .bin/Scripts/checklist.ps1 | 26 ++++----- .bin/Scripts/copy_office.cmd | 2 +- .bin/Scripts/diagnostics.ps1 | 31 +++++------ .bin/Scripts/reset_browsers.ps1 | 10 ++-- .bin/Scripts/sfc_scan.cmd | 19 +++++++ .bin/Scripts/transferred_keys.cmd | 19 +++---- .bin/Scripts/update_tools.ps1 | 9 +++- .../vendor/conemu-maximus5/ConEmu.xml | 34 ++++++------ Activate Windows (with BIOS key).cmd | 17 ------ .../Activate Windows (with BIOS key).cmd | 44 +++++++++++++++ Battery Health.cmd | 32 ++++++++++- Copy-WizardKit.cmd | 8 +-- Data Recovery/PhotoRec (CLI).cmd | 32 ++++++++++- Data Recovery/PhotoRec.cmd | 32 ++++++++++- Data Recovery/TestDisk.cmd | 32 ++++++++++- Data Transfers/Explorer++.cmd | 32 ++++++++++- Data Transfers/FastCopy (as ADMIN).cmd | 34 +++++++++++- Data Transfers/FastCopy.cmd | 34 +++++++++++- Data Transfers/KVRT.cmd | 32 ++++++++++- Data Transfers/Transferred Keys.cmd | 48 ++++++++++++++--- Diagnostics/AIDA64.cmd | 32 ++++++++++- Diagnostics/Auslogics DiskDefrag.cmd | 32 ++++++++++- Diagnostics/Autoruns.cmd | 32 ++++++++++- Diagnostics/BIOSCodes.cmd | 32 ++++++++++- Diagnostics/BatteryInfoView.cmd | 32 ++++++++++- Diagnostics/BleachBit.cmd | 32 ++++++++++- Diagnostics/BlueScreenView.cmd | 32 ++++++++++- Diagnostics/CPU-Z.cmd | 32 ++++++++++- Diagnostics/ERUNT.cmd | 34 +++++++++++- Diagnostics/GpuTest.cmd | 32 ++++++++++- Diagnostics/HWMonitor.cmd | 32 ++++++++++- Diagnostics/HeavyLoad.cmd | 32 ++++++++++- Diagnostics/HitmanPro (FullBreach).cmd | 34 +++++++++++- Diagnostics/HitmanPro.cmd | 34 +++++++++++- Diagnostics/MailPasswordView (as ADMIN).cmd | 45 +++++++++++++--- Diagnostics/MailPasswordView.cmd | 45 +++++++++++++--- Diagnostics/OutlookAttachView (as ADMIN).cmd | 45 +++++++++++++--- Diagnostics/OutlookAttachView.cmd | 45 +++++++++++++--- Diagnostics/ProduKey.cmd | 51 +++++++++++++----- Drivers/Auto Detect - Acer.cmd | 34 +++++++++++- Drivers/Auto Detect - Dell.cmd | 34 +++++++++++- Drivers/Auto Detect - HP.cmd | 34 +++++++++++- Drivers/Auto Detect - Intel.cmd | 32 ++++++++++- Drivers/Auto Detect - Lenovo.cmd | 34 +++++++++++- Drivers/Auto Detect - SDI.cmd | 32 ++++++++++- Drivers/Auto Detect - Toshiba.cmd | 34 +++++++++++- Drivers/GPU - AMD.cmd | 32 ++++++++++- Drivers/GPU - Gaming Evolved (AMD).cmd | 32 ++++++++++- Drivers/GPU - GeForce Experience.cmd | 32 ++++++++++- Drivers/SSD - ExpressCache.cmd | 32 ++++++++++- Drivers/SSD - Intel.cmd | 32 ++++++++++- Drivers/SSD - Samsung.cmd | 32 ++++++++++- Enter SafeMode.cmd | 32 ++++++++++- Exit SafeMode.cmd | 32 ++++++++++- Final Checklist.cmd | 32 ++++++++++- .../2007 Microsoft Office system (SP3).cmd | 40 ++++++++++++++ .../Extras/Office/2007/Access 2007 (SP3).cmd | 40 ++++++++++++++ .../Extras/Office/2007/AccessRuntime2007.cmd | 40 ++++++++++++++ .../2007/Home and Student 2007 (SP3).cmd | 40 ++++++++++++++ .../Extras/Office/2007/Outlook 2007 (SP3).cmd | 40 ++++++++++++++ .../Office/2007/Professional 2007 (SP3).cmd | 40 ++++++++++++++ .../Office/2007/Publisher 2007 (SP3).cmd | 40 ++++++++++++++ .../Office/2007/Small Business 2007 (SP3).cmd | 40 ++++++++++++++ .../Office/2010/Outlook 2010 (SP2) (x32).cmd | 40 ++++++++++++++ .../Office/2010/Outlook 2010 (SP2) (x64).cmd | 40 ++++++++++++++ .../2010/Professional Plus 2010 (SP2).cmd | 40 ++++++++++++++ .../Office/2010/Publisher 2010 (SP2).cmd | 40 ++++++++++++++ .../Office/2010/Single Image 2010 (SP2).cmd | 40 ++++++++++++++ .../Office/2013/Home and Business 2013.cmd | 40 ++++++++++++++ .../Office/2013/Home and Student 2013.cmd | 40 ++++++++++++++ .../Office/2013/Professional Plus 2013.cmd | 40 ++++++++++++++ .../Office/2016/Home and Business 2016.cmd | 40 ++++++++++++++ .../Office/2016/Home and Student 2016.cmd | 40 ++++++++++++++ .../2007 Microsoft Office system (SP3).cmd | 9 ---- Installers/Office/2007/Access 2007 (SP3).cmd | 9 ---- Installers/Office/2007/AccessRuntime2007.cmd | 9 ---- .../2007/Home and Student 2007 (SP3).cmd | 9 ---- Installers/Office/2007/Outlook 2007 (SP3).cmd | 9 ---- .../Office/2007/Professional 2007 (SP3).cmd | 9 ---- .../Office/2007/Publisher 2007 (SP3).cmd | 9 ---- .../Office/2007/Small Business 2007 (SP3).cmd | 9 ---- .../Office/2010/Outlook 2010 (SP2) (x32).cmd | 9 ---- .../Office/2010/Outlook 2010 (SP2) (x64).cmd | 9 ---- .../2010/Professional Plus 2010 (SP2).cmd | 9 ---- .../Office/2010/Publisher 2010 (SP2).cmd | 9 ---- .../Office/2010/Single Image 2010 (SP2).cmd | 9 ---- .../Office/2013/Home and Business 2013.cmd | 9 ---- .../Office/2013/Home and Student 2013.cmd | 9 ---- .../Office/2013/Professional Plus 2013.cmd | 9 ---- .../Office/2016/Home and Business 2016.cmd | 9 ---- .../Office/2016/Home and Student 2016.cmd | 9 ---- Misc/Cmder (as ADMIN).cmd | 32 ++++++++++- Misc/Cmder.cmd | 32 ++++++++++- Misc/DeviceRemover.cmd | 32 ++++++++++- Misc/Explorer++.cmd | 32 ++++++++++- Misc/Force Windows 10 Anniversary Update.url | 5 ++ .../Hide Windows 10 Upgrade.reg | Bin Misc/Notepad2.cmd | 32 ++++++++++- Misc/PerfMonitor2.cmd | 32 ++++++++++- Misc/SysinternalsSuite.cmd | 32 ++++++++++- Misc/WinDirStat.cmd | 32 ++++++++++- Misc/XMPlay.cmd | 34 +++++++++++- Misc/_Update Kit.cmd | 32 ++++++++++- Repairs/AdwCleaner.cmd | 37 +++++++++++-- Repairs/Autoruns.cmd | 32 ++++++++++- Repairs/CHKDSK (Fix).cmd | 32 ++++++++++- Repairs/CHKDSK.cmd | 32 ++++++++++- Repairs/Complete Internet Repair.cmd | 42 +++++++++++++-- Repairs/DISM.cmd | 32 ++++++++++- Repairs/ESET & KVRT.cmd | 36 +++++++++++-- Repairs/JRT.cmd | 32 ++++++++++- Repairs/MBAM & SAS.cmd | 16 ------ Repairs/MBAM.cmd | 43 +++++++++++++++ Repairs/RKill.cmd | 45 ++++++++++++---- Repairs/SAS (Deprecated).cmd | 42 +++++++++++++++ Repairs/SFC Scan.cmd | 32 ++++++++++- Repairs/Shortcut Cleaner (Testing).cmd | 32 ++++++++++- Repairs/TDSSKiller.cmd | 36 +++++++++++-- Reset Browsers.cmd | 32 ++++++++++- SW Diagnostics.cmd | 32 ++++++++++- Uninstallers/IObit Uninstaller.cmd | 32 ++++++++++- Uninstallers/MyUninstaller.cmd | 39 ++++++++++++++ Uninstallers/PC Decrapifier (Deprecated).cmd | 32 ++++++++++- Uninstallers/Removal Tools.cmd | 36 +++++++++++-- Uninstallers/Revo Uninstaller.cmd | 32 ++++++++++- 127 files changed, 3301 insertions(+), 427 deletions(-) create mode 100644 .bin/Scripts/sfc_scan.cmd delete mode 100644 Activate Windows (with BIOS key).cmd create mode 100644 Activation/Activate Windows (with BIOS key).cmd create mode 100644 Installers/Extras/Office/2007/2007 Microsoft Office system (SP3).cmd create mode 100644 Installers/Extras/Office/2007/Access 2007 (SP3).cmd create mode 100644 Installers/Extras/Office/2007/AccessRuntime2007.cmd create mode 100644 Installers/Extras/Office/2007/Home and Student 2007 (SP3).cmd create mode 100644 Installers/Extras/Office/2007/Outlook 2007 (SP3).cmd create mode 100644 Installers/Extras/Office/2007/Professional 2007 (SP3).cmd create mode 100644 Installers/Extras/Office/2007/Publisher 2007 (SP3).cmd create mode 100644 Installers/Extras/Office/2007/Small Business 2007 (SP3).cmd create mode 100644 Installers/Extras/Office/2010/Outlook 2010 (SP2) (x32).cmd create mode 100644 Installers/Extras/Office/2010/Outlook 2010 (SP2) (x64).cmd create mode 100644 Installers/Extras/Office/2010/Professional Plus 2010 (SP2).cmd create mode 100644 Installers/Extras/Office/2010/Publisher 2010 (SP2).cmd create mode 100644 Installers/Extras/Office/2010/Single Image 2010 (SP2).cmd create mode 100644 Installers/Extras/Office/2013/Home and Business 2013.cmd create mode 100644 Installers/Extras/Office/2013/Home and Student 2013.cmd create mode 100644 Installers/Extras/Office/2013/Professional Plus 2013.cmd create mode 100644 Installers/Extras/Office/2016/Home and Business 2016.cmd create mode 100644 Installers/Extras/Office/2016/Home and Student 2016.cmd delete mode 100644 Installers/Office/2007/2007 Microsoft Office system (SP3).cmd delete mode 100644 Installers/Office/2007/Access 2007 (SP3).cmd delete mode 100644 Installers/Office/2007/AccessRuntime2007.cmd delete mode 100644 Installers/Office/2007/Home and Student 2007 (SP3).cmd delete mode 100644 Installers/Office/2007/Outlook 2007 (SP3).cmd delete mode 100644 Installers/Office/2007/Professional 2007 (SP3).cmd delete mode 100644 Installers/Office/2007/Publisher 2007 (SP3).cmd delete mode 100644 Installers/Office/2007/Small Business 2007 (SP3).cmd delete mode 100644 Installers/Office/2010/Outlook 2010 (SP2) (x32).cmd delete mode 100644 Installers/Office/2010/Outlook 2010 (SP2) (x64).cmd delete mode 100644 Installers/Office/2010/Professional Plus 2010 (SP2).cmd delete mode 100644 Installers/Office/2010/Publisher 2010 (SP2).cmd delete mode 100644 Installers/Office/2010/Single Image 2010 (SP2).cmd delete mode 100644 Installers/Office/2013/Home and Business 2013.cmd delete mode 100644 Installers/Office/2013/Home and Student 2013.cmd delete mode 100644 Installers/Office/2013/Professional Plus 2013.cmd delete mode 100644 Installers/Office/2016/Home and Business 2016.cmd delete mode 100644 Installers/Office/2016/Home and Student 2016.cmd create mode 100644 Misc/Force Windows 10 Anniversary Update.url rename Hide Windows 10 Upgrade.reg => Misc/Hide Windows 10 Upgrade.reg (100%) delete mode 100644 Repairs/MBAM & SAS.cmd create mode 100644 Repairs/MBAM.cmd create mode 100644 Repairs/SAS (Deprecated).cmd create mode 100644 Uninstallers/MyUninstaller.cmd diff --git a/.bin/Scripts/Launch.cmd b/.bin/Scripts/Launch.cmd index 761bee04..c8a4d0ea 100644 --- a/.bin/Scripts/Launch.cmd +++ b/.bin/Scripts/Launch.cmd @@ -22,7 +22,7 @@ set "con=%~dp0\..\cmder_mini\vendor\conemu-maximus5\ConEmu.exe" if !arch! equ 64 set "con=%~dp0\..\cmder_mini\vendor\conemu-maximus5\ConEmu.exe" :Launch -pushd %2 +pushd "%2" if /i "%1" == "Console" (goto LaunchConsole) if /i "%1" == "Office" (goto LaunchOfficeSetup) if /i "%1" == "Program" (goto LaunchProgram) @@ -31,7 +31,9 @@ goto Usage :LaunchConsole set "prog=%~3" -dir "!prog:.=64.!" >nul 2>&1 && if !arch! equ 64 set "prog=!prog:.=64.!" +if !arch! equ 64 ( + if exist "!prog:.=64.!" set "prog=!prog:.=64.!" +) if not exist "!prog!" goto ProgramNotFound if defined admin ( start "" "%con%" -cmd "!prog!" %~4 -new_console:a -new_console:n @@ -47,7 +49,9 @@ goto Done :LaunchProgram set "prog=%~3" -dir "!prog:.=64.!" >nul 2>&1 && if !arch! equ 64 set "prog=!prog:.=64.!" +if !arch! equ 64 ( + if exist "!prog:.=64.!" set "prog=!prog:.=64.!" +) if not exist "!prog!" goto ProgramNotFound if not "%~4" == "" (set "ps_args=-argumentlist '%~4'") if defined admin ( diff --git a/.bin/Scripts/activate.ps1 b/.bin/Scripts/activate.ps1 index b29ff31a..150fb333 100644 --- a/.bin/Scripts/activate.ps1 +++ b/.bin/Scripts/activate.ps1 @@ -14,22 +14,23 @@ md "$logpath" 2>&1 | out-null $log = "$logpath\Activation.log" $bin = (Get-Item $wd).Parent.FullName $found_key = $false +$sz = "$bin\7-Zip\7za.exe" +$produkey = "$bin\tmp\ProduKey.exe" # OS Check . .\os_check.ps1 +if ($arch -eq 64) { + $sz = "$bin\7-Zip\7za64.exe" + $produkey = "$bin\tmp\ProduKey64.exe" +} ## Extract ProduKey -md "$bin\ProduKey" 2>&1 | out-null -start -wait "$bin\7-Zip\7z.exe" -argumentlist @("x", "$bin\ProduKey.7z", "-o$bin\ProduKey", "-aos", "-pGerbil14") -workingdirectory "$bin\7-Zip" -nonewwindow -redirectstandardoutput out-null +md "$bin\tmp" 2>&1 | out-null +start -wait $sz -argumentlist @("e", "$bin\ProduKey.7z", "-otmp", "-aoa", "-pAbracadabra", "-bsp0", "-bso0") -workingdirectory "$bin" -nonewwindow +rm "$bin\tmp\ProduKey*.cfg" sleep -s 1 ## Get Key ## -ri "$bin\ProduKey\*.cfg" -if ($arch -eq 64) { - $prog = "$bin\ProduKey\ProduKey64.exe" -} else { - $prog = "$bin\ProduKey\ProduKey.exe" -} $produkey_args = @( "/nosavereg", "/scomma", "$logpath\keys.csv", @@ -39,7 +40,7 @@ $produkey_args = @( "/SQLKeys", "0", "/ExchangeKeys", "0" ) -start -wait $prog -argumentlist $produkey_args -workingdirectory "$bin\ProduKey" +start -wait $produkey -argumentlist $produkey_args -workingdirectory "$bin\tmp" $keys = import-csv -header ("Name", "ID", "Key") "$logpath\keys.csv" ## Find BIOS Key and activate Windows with it diff --git a/.bin/Scripts/checklist.ps1 b/.bin/Scripts/checklist.ps1 index b0403cc8..c89654f6 100644 --- a/.bin/Scripts/checklist.ps1 +++ b/.bin/Scripts/checklist.ps1 @@ -13,9 +13,15 @@ $bin = (Get-Item $wd).Parent.FullName $diag_dest = "/srv/Diagnostics" $diag_server = "10.0.0.10" $diag_user = "wkdiag" +$sz = "$bin\7-Zip\7za.exe" +$produkey = "$bin\tmp\ProduKey.exe" # OS Check . .\os_check.ps1 +if ($arch -eq 64) { + $sz = "$bin\7-Zip\7za64.exe" + $produkey = "$bin\tmp\ProduKey64.exe" +} # Set Service Order while ($service_order -notmatch '^\d+') { @@ -147,28 +153,16 @@ if (!(test-path "$logpath\aida64.htm")) { # Product Keys ## Extract -md "$bin\ProduKey" 2>&1 | out-null -$sz_args = @( - "x", - ('"{0}\ProduKey.7z"' -f $bin), - ('-o"{0}\ProduKey"' -f $bin), - "-aos", - "-pAbracadabra") -start "$bin\7-Zip\7z.exe" -argumentlist $sz_args -wait -windowstyle minimized +md "$bin\tmp" 2>&1 | out-null +start -wait $sz -argumentlist @("e", "$bin\ProduKey.7z", "-otmp", "-aoa", "-pAbracadabra", "-bsp0", "-bso0") -workingdirectory "$bin" -nonewwindow +rm "$bin\tmp\ProduKey*.cfg" sleep -s 1 ## Run if (!(test-path "$logpath\keys.txt")) { wk-write "* Saving Product Keys" "$log" - ri "$bin\ProduKey\*.cfg" - if ($arch -eq 64) { - $prog = "$bin\ProduKey\ProduKey64.exe" - } else { - $prog = "$bin\ProduKey\ProduKey.exe" - } - start -wait $prog -argumentlist @("/nosavereg", "/stext", "$logpath\keys.txt") -workingdirectory "$bin\ProduKey" + start -wait $produkey -argumentlist @("/nosavereg", "/stext", "$logpath\keys.txt") -workingdirectory "$bin\tmp" } -wk-write "" "$log" # User Data wk-write "==== User Data ====" "$log" diff --git a/.bin/Scripts/copy_office.cmd b/.bin/Scripts/copy_office.cmd index 0ba258b7..3b2884dd 100644 --- a/.bin/Scripts/copy_office.cmd +++ b/.bin/Scripts/copy_office.cmd @@ -15,7 +15,7 @@ set "pd=%cd%" set "NAS=\\10.0.0.10\Office" set "dest=%systemdrive%\WK\Office" set "source=%~1" -pushd !NAS! +pushd "!NAS!" :VerifyCopyAndRun if /i "!source!" == "" (goto UsageError) diff --git a/.bin/Scripts/diagnostics.ps1 b/.bin/Scripts/diagnostics.ps1 index 58705a9b..30607c47 100644 --- a/.bin/Scripts/diagnostics.ps1 +++ b/.bin/Scripts/diagnostics.ps1 @@ -16,11 +16,15 @@ $diag_dest = "/srv/Diagnostics" $diag_server = "10.0.0.10" $diag_user = "wkdiag" $conemu = "$bin\cmder_mini\vendor\conemu-maximus5\ConEmu.exe" +$sz = "$bin\7-Zip\7za.exe" +$produkey = "$bin\tmp\ProduKey.exe" # OS Check . .\os_check.ps1 if ($arch -eq 64) { $conemu = "$bin\cmder_mini\vendor\conemu-maximus5\ConEmu64.exe" + $sz = "$bin\7-Zip\7za64.exe" + $produkey = "$bin\tmp\ProduKey64.exe" } # Set Service Order @@ -131,7 +135,7 @@ if (test-path "$localappdata\Google\Chrome") { "a", "-t7z", "-mx=1", "$backup_path\Chrome.7z", '"User Data"') - start "$bin\7-Zip\7z.exe" -argumentlist $sz_args -wait -windowstyle minimized + start $sz -argumentlist $sz_args -wait -windowstyle minimized popd } if (test-path "$appdata\Mozilla\Firefox") { @@ -142,7 +146,7 @@ if (test-path "$appdata\Mozilla\Firefox") { "$backup_path\Firefox.7z", "Profiles", "profiles.ini") - start "$bin\7-Zip\7z.exe" -argumentlist $sz_args -wait -windowstyle minimized + start $sz -argumentlist $sz_args -wait -windowstyle minimized popd } if (test-path "$userprofile\Favorites") { @@ -152,7 +156,7 @@ if (test-path "$userprofile\Favorites") { "a", "-t7z", "-mx=1", "$backup_path\IE Favorites.7z", "Favorites") - start "$bin\7-Zip\7z.exe" -argumentlist $sz_args -wait -windowstyle minimized + start $sz -argumentlist $sz_args -wait -windowstyle minimized popd } @@ -200,29 +204,18 @@ if (!(test-path "$logpath\aida64.htm")) { # Product Keys ## Extract -md "$bin\ProduKey" 2>&1 | out-null -$sz_args = @( - "x", - ('"{0}\ProduKey.7z"' -f $bin), - ('-o"{0}\ProduKey"' -f $bin), - "-aos", - "-pAbracadabra") -start "$bin\7-Zip\7z.exe" -argumentlist $sz_args -wait -windowstyle minimized +md "$bin\tmp" 2>&1 | out-null +start -wait $sz -argumentlist @("e", "$bin\ProduKey.7z", "-otmp", "-aoa", "-pAbracadabra", "-bsp0", "-bso0") -workingdirectory "$bin" -nonewwindow +rm "$bin\tmp\ProduKey*.cfg" sleep -s 1 ## Run if (!(test-path "$logpath\keys.txt")) { wk-write "* Saving Product Keys" "$log" - ri "$bin\ProduKey\*.cfg" - if ($arch -eq 64) { - $prog = "$bin\ProduKey\ProduKey64.exe" - } else { - $prog = "$bin\ProduKey\ProduKey.exe" - } - start -wait $prog -argumentlist @("/nosavereg", "/stext", "$logpath\keys.txt") -workingdirectory "$bin\ProduKey" + start -wait $produkey -argumentlist @("/nosavereg", "/stext", "$logpath\keys.txt") -workingdirectory "$bin\tmp" } -## Block Windows 10 ## +# Block Windows 10 # if ($win_version -notmatch '^10$') { # Kill GWX taskkill /f /im gwx.exe diff --git a/.bin/Scripts/reset_browsers.ps1 b/.bin/Scripts/reset_browsers.ps1 index c2c206d0..bacab45e 100644 --- a/.bin/Scripts/reset_browsers.ps1 +++ b/.bin/Scripts/reset_browsers.ps1 @@ -12,6 +12,7 @@ md "$backup_path" 2>&1 | out-null md "$logpath" 2>&1 | out-null $log = "$logpath\Browsers.log" $bin = (Get-Item $wd).Parent.FullName +$sz = "$bin\7-Zip\7za.exe" # Vars $ff_appdata = "$appdata\Mozilla\Firefox" @@ -30,6 +31,9 @@ $chrome_profile_list = $chrome_profile_list -inotmatch '\.wkbak' -imatch '^(Defa # OS Check . .\os_check.ps1 +if ($arch -eq 64) { + $sz = "$bin\7-Zip\7za64.exe" +} # Functions function gen-backup-name { @@ -102,7 +106,7 @@ if (test-path "$userprofile\Favorites") { "-mx=1", "$backup_path\IE Favorites.7z", "Favorites") - start "$bin\7-Zip\7z.exe" -argumentlist $sz_args -wait -windowstyle minimized + start $sz -argumentlist $sz_args -wait -windowstyle minimized popd } @@ -178,7 +182,7 @@ if (test-path "$ff_appdata") { "$backup_path\Firefox.7z", "Profiles", "profiles.ini") - start "$bin\7-Zip\7z.exe" -argumentlist $sz_args -wait -windowstyle minimized + start $sz -argumentlist $sz_args -wait -windowstyle minimized popd } @@ -309,7 +313,7 @@ if (test-path "$chrome_appdata") { "-mx=1", "$backup_path\Chrome.7z", '"User Data"') - start "$bin\7-Zip\7z.exe" -argumentlist $sz_args -wait -windowstyle minimized + start $sz -argumentlist $sz_args -wait -windowstyle minimized popd } diff --git a/.bin/Scripts/sfc_scan.cmd b/.bin/Scripts/sfc_scan.cmd new file mode 100644 index 00000000..a934cb96 --- /dev/null +++ b/.bin/Scripts/sfc_scan.cmd @@ -0,0 +1,19 @@ +@echo off + +:Flags +set fix= +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) + if /i "%%f" == "/f" (set fix=/f) +) + +:Init +title WK System File Checker +color 1b + +:ScheduleCheck +sfc /scannow + +:Done +echo Press any key to exit... +pause>nul \ No newline at end of file diff --git a/.bin/Scripts/transferred_keys.cmd b/.bin/Scripts/transferred_keys.cmd index d2c63394..56726f4f 100644 --- a/.bin/Scripts/transferred_keys.cmd +++ b/.bin/Scripts/transferred_keys.cmd @@ -11,10 +11,7 @@ for %%f in (%*) do ( setlocal EnableDelayedExpansion color 1b title WK Key Finder - -:ClearConfigs -if exist "ProduKey\ProduKey.cfg" del "ProduKey\ProduKey.cfg" -if exist "ProduKey\ProduKey64.cfg" del "ProduKey\ProduKey64.cfg" +set "bin=.." :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as !log_dir! @@ -29,7 +26,7 @@ if exist "!sw_hive!" ( set "found_hive=true" echo. !sw_hive! echo ==== !sw_hive! ====>> "!log_dir!\transferred_keys.txt" - call "Launch.cmd" Program "!cd!\..\ProduKey" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin + call "Launch.cmd" Program "!bin!\tmp" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin type "!log_dir!\transferred_keys.tmp">> "!log_dir!\transferred_keys.txt" del "!log_dir!\transferred_keys.tmp" ) @@ -38,7 +35,7 @@ if exist "!sw_hive!" ( set "found_hive=true" echo. !sw_hive! echo ==== !sw_hive! ====>> "!log_dir!\transferred_keys.txt" - call "Launch.cmd" Program "!cd!\..\ProduKey" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin + call "Launch.cmd" Program "!bin!\tmp" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin type "!log_dir!\transferred_keys.tmp">> "!log_dir!\transferred_keys.txt" del "!log_dir!\transferred_keys.tmp" ) @@ -47,7 +44,7 @@ if exist "!sw_hive!" ( set "found_hive=true" echo. !sw_hive! echo ==== !sw_hive! ====>> "!log_dir!\transferred_keys.txt" - call "Launch.cmd" Program "!cd!\..\ProduKey" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin + call "Launch.cmd" Program "!bin!\tmp" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin type "!log_dir!\transferred_keys.tmp">> "!log_dir!\transferred_keys.txt" del "!log_dir!\transferred_keys.tmp" ) @@ -58,7 +55,7 @@ if exist "!sw_hive!" ( set "found_hive=true" echo. !sw_hive! echo ==== !sw_hive! ====>> "!log_dir!\transferred_keys.txt" - call "Launch.cmd" Program "!cd!\..\ProduKey" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin + call "Launch.cmd" Program "!bin!\tmp" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin type "!log_dir!\transferred_keys.tmp">> "!log_dir!\transferred_keys.txt" del "!log_dir!\transferred_keys.tmp" ) @@ -67,7 +64,7 @@ if exist "!sw_hive!" ( set "found_hive=true" echo. !sw_hive! echo ==== !sw_hive! ====>> "!log_dir!\transferred_keys.txt" - call "Launch.cmd" Program "!cd!\..\ProduKey" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin + call "Launch.cmd" Program "!bin!\tmp" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin type "!log_dir!\transferred_keys.tmp">> "!log_dir!\transferred_keys.txt" del "!log_dir!\transferred_keys.tmp" ) @@ -76,14 +73,14 @@ if exist "!sw_hive!" ( set "found_hive=true" echo. !sw_hive! echo ==== !sw_hive! ====>> "!log_dir!\transferred_keys.txt" - call "Launch.cmd" Program "!cd!\..\ProduKey" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin + call "Launch.cmd" Program "!bin!\tmp" "ProduKey.exe" "/IEKeys 0 /ExtractEdition 1 /nosavereg /regfile !sw_hive! /stext !log_dir!\transferred_keys.tmp" /wait /admin type "!log_dir!\transferred_keys.tmp">> "!log_dir!\transferred_keys.txt" del "!log_dir!\transferred_keys.tmp" ) :ShowResults if not defined found_hive (goto NoResults) -call "Launch.cmd" Program "!cd!\..\Notepad2" "Notepad2-Mod.exe" "!log_dir!\transferred_keys.txt" +call "Launch.cmd" Program "%bin%\Notepad2" "Notepad2-Mod.exe" "%log_dir%\transferred_keys.txt" goto Done :NoResults diff --git a/.bin/Scripts/update_tools.ps1 b/.bin/Scripts/update_tools.ps1 index 780e1007..f14b162e 100644 --- a/.bin/Scripts/update_tools.ps1 +++ b/.bin/Scripts/update_tools.ps1 @@ -8,6 +8,13 @@ clear $host.UI.RawUI.WindowTitle = "Wizard Kit Update Tool" $bin = (Get-Item $wd).Parent.FullName $curl = "$bin\curl\curl.exe" +$sz = "$bin\7-Zip\7za.exe" + +# OS Check +. .\os_check.ps1 +if ($arch -eq 64) { + $sz = "$bin\7-Zip\7za64.exe" +} ## Functions ## function download-file { @@ -159,7 +166,7 @@ $dl_page = "http://www.samsung.com/semiconductor/minisite/ssd/download/tools.htm $regex = "href=./semiconductor/minisite/ssd/downloads/software/Samsung_Magician_Setup_v[0-9]+.zip" $url = "http://www.samsung.com{0}" -f (find-dynamic-url $dl_page $regex) download-file $path $name $url -start "$bin\7-Zip\7z.exe" -argumentlist @("e", "`"$bin\_Drivers\Samsung Magician.zip`"", "-aoa", "-bso0", "-bsp0", "-o$bin\_Drivers") -nonewwindow -wait +start $sz -argumentlist @("e", "`"$bin\_Drivers\Samsung Magician.zip`"", "-aoa", "-bso0", "-bsp0", "-o$bin\_Drivers") -nonewwindow -wait Remove-Item "$bin\_Drivers\Samsung Magician.exe" $path 2>&1 | Out-Null Remove-Item "$bin\_Drivers\Samsung Magician.zip" $path 2>&1 | Out-Null Move-Item "$bin\_Drivers\Samsung*exe" "$bin\_Drivers\Samsung Magician.exe" $path 2>&1 | Out-Null diff --git a/.bin/cmder_mini/vendor/conemu-maximus5/ConEmu.xml b/.bin/cmder_mini/vendor/conemu-maximus5/ConEmu.xml index d285c009..7f70aaf6 100644 --- a/.bin/cmder_mini/vendor/conemu-maximus5/ConEmu.xml +++ b/.bin/cmder_mini/vendor/conemu-maximus5/ConEmu.xml @@ -1,7 +1,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -122,10 +122,10 @@ - + - - + + @@ -134,10 +134,10 @@ - - + + - + @@ -483,9 +483,9 @@ - + - + @@ -494,7 +494,7 @@ - + @@ -503,7 +503,7 @@ - + @@ -512,7 +512,7 @@ - + @@ -523,11 +523,11 @@ - + - - + + @@ -628,7 +628,7 @@ - + diff --git a/Activate Windows (with BIOS key).cmd b/Activate Windows (with BIOS key).cmd deleted file mode 100644 index 99cc1080..00000000 --- a/Activate Windows (with BIOS key).cmd +++ /dev/null @@ -1,17 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Extract -pushd %~dp0\..\.bin -cls -mkdir "ProduKey" >nul 2>&1 -7-Zip\7z.exe x ProduKey.7z -oProduKey -aos -pAbracadabra -bsp0 -bso0 -ping -n 1 127.0.0.1>nul -popd - -:Launch -call "%~dp0\.bin\Scripts\Launch.cmd" PSScript "%~dp0\.bin\Scripts" "activate.ps1" /admin \ No newline at end of file diff --git a/Activation/Activate Windows (with BIOS key).cmd b/Activation/Activate Windows (with BIOS key).cmd new file mode 100644 index 00000000..7135e4b8 --- /dev/null +++ b/Activation/Activate Windows (with BIOS key).cmd @@ -0,0 +1,44 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:Launch +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "activate.ps1" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Battery Health.cmd b/Battery Health.cmd index 0bcc42d3..271a8bb7 100644 --- a/Battery Health.cmd +++ b/Battery Health.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\.bin\Scripts\Launch.cmd" PSScript "%~dp0\.bin\Scripts" "check_battery.ps1" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "check_battery.ps1" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Copy-WizardKit.cmd b/Copy-WizardKit.cmd index 3d00ca57..0b3d1198 100644 --- a/Copy-WizardKit.cmd +++ b/Copy-WizardKit.cmd @@ -43,15 +43,17 @@ popd :: Root files :: set "args=" call :RoboCopy "!source!\.bin\Scripts" "!dest!\.bin\Scripts" "" "!args!" -copy /y "!source!\Activate Windows (with BIOS key).cmd" "!dest!\" copy /y "!source!\Battery Health.cmd" "!dest!\" copy /y "!source!\Enter SafeMode.cmd" "!dest!\" copy /y "!source!\Exit SafeMode.cmd" "!dest!\" copy /y "!source!\Final Checklist.cmd" "!dest!\" -copy /y "!source!\Hide Windows 10 Upgrade.reg" "!dest!\" copy /y "!source!\Reset Browsers.cmd" "!dest!\" copy /y "!source!\SW Diagnostics.cmd" "!dest!\" +:: Activation :: +set "args=" +call :RoboCopy "!source!\Activation" "!dest!\Activation" "" "!args!" + :: Data Recovery :: rem Disabled. rem set "args=" @@ -105,7 +107,7 @@ set wrongpath= :: Testing one for one dir is probably enough. dir "Uninstallers" >nul 2>&1 if %errorlevel% neq 0 (set wrongpath=true) -if not defined wrongpath (pushd %1) +if not defined wrongpath (pushd "%1") goto :EOF :WizardKitNotFound diff --git a/Data Recovery/PhotoRec (CLI).cmd b/Data Recovery/PhotoRec (CLI).cmd index aa0c98d0..bd25bb58 100644 --- a/Data Recovery/PhotoRec (CLI).cmd +++ b/Data Recovery/PhotoRec (CLI).cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Console "%~dp0\..\.bin\TestDisk" "photorec_win.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Console "%bin%\TestDisk" "photorec_win.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Data Recovery/PhotoRec.cmd b/Data Recovery/PhotoRec.cmd index 666c6594..18a69d72 100644 --- a/Data Recovery/PhotoRec.cmd +++ b/Data Recovery/PhotoRec.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\TestDisk" "qphotorec_win.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\TestDisk" "qphotorec_win.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Data Recovery/TestDisk.cmd b/Data Recovery/TestDisk.cmd index b1e8586b..f08d7fdb 100644 --- a/Data Recovery/TestDisk.cmd +++ b/Data Recovery/TestDisk.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Console "%~dp0\..\.bin\TestDisk" "testdisk_win.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Console "%bin%\TestDisk" "testdisk_win.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Data Transfers/Explorer++.cmd b/Data Transfers/Explorer++.cmd index b46e95dc..33177709 100644 --- a/Data Transfers/Explorer++.cmd +++ b/Data Transfers/Explorer++.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\Explorer++" "Explorer++.exe" "%userprofile%" /max \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\Explorer++" "Explorer++.exe" "%userprofile%" /max +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Data Transfers/FastCopy (as ADMIN).cmd b/Data Transfers/FastCopy (as ADMIN).cmd index 33c974d6..521db719 100644 --- a/Data Transfers/FastCopy (as ADMIN).cmd +++ b/Data Transfers/FastCopy (as ADMIN).cmd @@ -5,9 +5,39 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as %log_dir% -call "%~dp0\..\.bin\Scripts\wk_info.cmd" +call "%bin%\Scripts\wk_info.cmd" :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\FastCopy" "FastCopy.exe" "/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=%systemdrive%\WK\Transfer\" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\FastCopy" "FastCopy.exe" "/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=%systemdrive%\WK\Transfer\" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Data Transfers/FastCopy.cmd b/Data Transfers/FastCopy.cmd index d8e3450d..b9649ae6 100644 --- a/Data Transfers/FastCopy.cmd +++ b/Data Transfers/FastCopy.cmd @@ -5,9 +5,39 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as %log_dir% -call "%~dp0\..\.bin\Scripts\wk_info.cmd" +call "%bin%\Scripts\wk_info.cmd" :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\FastCopy" "FastCopy.exe" "/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=%systemdrive%\WK\Transfer\" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\FastCopy" "FastCopy.exe" "/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=%systemdrive%\WK\Transfer\" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Data Transfers/KVRT.cmd b/Data Transfers/KVRT.cmd index 594193e9..1a80626b 100644 --- a/Data Transfers/KVRT.cmd +++ b/Data Transfers/KVRT.cmd @@ -5,9 +5,39 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :CreateQuarantineDir set "q_dir=%systemdrive%\WK\Quarantine\KVRT" mkdir "%q_dir%">nul 2>&1 :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "KVRT.exe" "-accepteula -d %q_dir% -processlevel 3 -dontcryptsupportinfo -fixednames" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "KVRT.exe" "-accepteula -d %q_dir% -processlevel 3 -dontcryptsupportinfo -fixednames" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Data Transfers/Transferred Keys.cmd b/Data Transfers/Transferred Keys.cmd index 937bebff..8eabbc37 100644 --- a/Data Transfers/Transferred Keys.cmd +++ b/Data Transfers/Transferred Keys.cmd @@ -5,12 +5,48 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) -:Extract -if not exist "%~dp0\..\.bin\ProduKey" ( - mkdir "%~dp0\..\.bin\ProduKey" >nul 2>&1 - call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "%~dp0\..\.bin\7-Zip\7z.exe" "x ProduKey.7z -oProduKey -aos -pAbracadabra" /wait - ping -n 1 127.0.0.1>nul +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone ) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:ClearConfigs +if not exist "%bin%\tmp" goto Extract +pushd "%bin%\tmp" +if exist "ProduKey.cfg" del "ProduKey.cfg" +if exist "ProduKey64.cfg" del "ProduKey64.cfg" +popd + +:Extract +cls +mkdir "%bin%\tmp" >nul 2>&1 +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "%bin%\7-Zip\7za.exe" "e ProduKey.7z -otmp -aoa -pAbracadabra -bsp0 -bso0" /wait +ping -n 1 127.0.0.1>nul :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Console "%~dp0\..\.bin\Scripts" "transferred_keys.cmd" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Console "%bin%\Scripts" "transferred_keys.cmd" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/AIDA64.cmd b/Diagnostics/AIDA64.cmd index 6b38e30f..0a21a5c3 100644 --- a/Diagnostics/AIDA64.cmd +++ b/Diagnostics/AIDA64.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\AIDA64" "aida64.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\AIDA64" "aida64.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/Auslogics DiskDefrag.cmd b/Diagnostics/Auslogics DiskDefrag.cmd index 1a5e35c1..03416ab8 100644 --- a/Diagnostics/Auslogics DiskDefrag.cmd +++ b/Diagnostics/Auslogics DiskDefrag.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\Auslogics DiskDefrag" "DiskDefrag.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\Auslogics DiskDefrag" "DiskDefrag.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/Autoruns.cmd b/Diagnostics/Autoruns.cmd index f0f36eab..5599b4f5 100644 --- a/Diagnostics/Autoruns.cmd +++ b/Diagnostics/Autoruns.cmd @@ -5,6 +5,24 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :ModifySettings 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 @@ -18,4 +36,16 @@ reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\SysinternalsSuite" "Autoruns.exe" "-e" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\SysinternalsSuite" "Autoruns.exe" "-e" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/BIOSCodes.cmd b/Diagnostics/BIOSCodes.cmd index c297cdd2..6ca0e0f2 100644 --- a/Diagnostics/BIOSCodes.cmd +++ b/Diagnostics/BIOSCodes.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\BIOSCodes" "BIOSCodes.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\BIOSCodes" "BIOSCodes.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/BatteryInfoView.cmd b/Diagnostics/BatteryInfoView.cmd index 0dde50f7..88823c3d 100644 --- a/Diagnostics/BatteryInfoView.cmd +++ b/Diagnostics/BatteryInfoView.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\BatteryInfoView" "BatteryInfoView.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\BatteryInfoView" "BatteryInfoView.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/BleachBit.cmd b/Diagnostics/BleachBit.cmd index f9e12634..d6b709c1 100644 --- a/Diagnostics/BleachBit.cmd +++ b/Diagnostics/BleachBit.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\BleachBit" "bleachbit.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\BleachBit" "bleachbit.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/BlueScreenView.cmd b/Diagnostics/BlueScreenView.cmd index fec3c011..22b1e90b 100644 --- a/Diagnostics/BlueScreenView.cmd +++ b/Diagnostics/BlueScreenView.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\BlueScreenView" "BlueScreenView.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\BlueScreenView" "BlueScreenView.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/CPU-Z.cmd b/Diagnostics/CPU-Z.cmd index 59e44b02..9333c843 100644 --- a/Diagnostics/CPU-Z.cmd +++ b/Diagnostics/CPU-Z.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\CPU-Z" "cpuz.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\CPU-Z" "cpuz.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/ERUNT.cmd b/Diagnostics/ERUNT.cmd index 47bda065..458f04cb 100644 --- a/Diagnostics/ERUNT.cmd +++ b/Diagnostics/ERUNT.cmd @@ -5,9 +5,39 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as %log_dir% -call "%~dp0\..\.bin\Scripts\wk_info.cmd" +call "%bin%\Scripts\wk_info.cmd" :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\erunt" "ERUNT.EXE" "%log_dir%%\Registry sysreg curuser otherusers" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\erunt" "ERUNT.EXE" "%log_dir%%\Registry sysreg curuser otherusers" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/GpuTest.cmd b/Diagnostics/GpuTest.cmd index 06ed3b19..f601eee1 100644 --- a/Diagnostics/GpuTest.cmd +++ b/Diagnostics/GpuTest.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\GpuTest" "GpuTest_GUI.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\GpuTest" "GpuTest_GUI.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/HWMonitor.cmd b/Diagnostics/HWMonitor.cmd index dd035cf0..613c9404 100644 --- a/Diagnostics/HWMonitor.cmd +++ b/Diagnostics/HWMonitor.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\HWMonitor" "HWMonitor.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\HWMonitor" "HWMonitor.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/HeavyLoad.cmd b/Diagnostics/HeavyLoad.cmd index e780f727..36935b7d 100644 --- a/Diagnostics/HeavyLoad.cmd +++ b/Diagnostics/HeavyLoad.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\HeavyLoad" "HeavyLoad.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\HeavyLoad" "HeavyLoad.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/HitmanPro (FullBreach).cmd b/Diagnostics/HitmanPro (FullBreach).cmd index e0949e95..c62e82e4 100644 --- a/Diagnostics/HitmanPro (FullBreach).cmd +++ b/Diagnostics/HitmanPro (FullBreach).cmd @@ -5,9 +5,39 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as %log_dir% -call "%~dp0\..\.bin\Scripts\wk_info.cmd" +call "%bin%\Scripts\wk_info.cmd" :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\HitmanPro" "HitmanPro.exe" "/scan /noinstall /noupload /log=%log_dir%\hitman.xml /fb" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\HitmanPro" "HitmanPro.exe" "/scan /noinstall /noupload /log=%log_dir%\hitman.xml /fb" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/HitmanPro.cmd b/Diagnostics/HitmanPro.cmd index c15f99e5..93a9465d 100644 --- a/Diagnostics/HitmanPro.cmd +++ b/Diagnostics/HitmanPro.cmd @@ -5,9 +5,39 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as %log_dir% -call "%~dp0\..\.bin\Scripts\wk_info.cmd" +call "%bin%\Scripts\wk_info.cmd" :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\HitmanPro" "HitmanPro.exe" "/scan /noinstall /noupload /log=%log_dir%\hitman.xml" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\HitmanPro" "HitmanPro.exe" "/scan /noinstall /noupload /log=%log_dir%\hitman.xml" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/MailPasswordView (as ADMIN).cmd b/Diagnostics/MailPasswordView (as ADMIN).cmd index eb883315..faacd91e 100644 --- a/Diagnostics/MailPasswordView (as ADMIN).cmd +++ b/Diagnostics/MailPasswordView (as ADMIN).cmd @@ -1,22 +1,51 @@ @echo off -:Init -setlocal enabledelayedexpansion -pushd %~dp0\..\.bin - :Flags for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Init +setlocal enabledelayedexpansion + :Extract -mkdir "mailpv" >nul 2>&1 -7-Zip\7z.exe x mailpv.7z -omailpv -aos -pAbracadabra -bsp0 -bso0 +mkdir "%bin%\tmp" >nul 2>&1 +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "%bin%\7-Zip\7za.exe" "x mailpv.7z -otmp -aoa -pAbracadabra -bsp0 -bso0" /wait ping -n 1 127.0.0.1>nul :Launch -call "Scripts\Launch.cmd" Program "mailpv" "mailpv.exe" "" /admin +call "%bin%\Scripts\Launch.cmd" Program "%bin%\tmp" "mailpv.exe" "" /admin :Done popd -endlocal \ No newline at end of file +endlocal +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/MailPasswordView.cmd b/Diagnostics/MailPasswordView.cmd index 503a7f80..d9344ce9 100644 --- a/Diagnostics/MailPasswordView.cmd +++ b/Diagnostics/MailPasswordView.cmd @@ -1,22 +1,51 @@ @echo off -:Init -setlocal enabledelayedexpansion -pushd %~dp0\..\.bin - :Flags for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Init +setlocal enabledelayedexpansion + :Extract -mkdir "mailpv" >nul 2>&1 -7-Zip\7z.exe x mailpv.7z -omailpv -aos -pAbracadabra -bsp0 -bso0 +mkdir "%bin%\tmp" >nul 2>&1 +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "%bin%\7-Zip\7za.exe" "x mailpv.7z -otmp -aoa -pAbracadabra -bsp0 -bso0" /wait ping -n 1 127.0.0.1>nul :Launch -call "Scripts\Launch.cmd" Program "mailpv" "mailpv.exe" "" +call "%bin%\Scripts\Launch.cmd" Program "%bin%\tmp" "mailpv.exe" "" :Done popd -endlocal \ No newline at end of file +endlocal +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/OutlookAttachView (as ADMIN).cmd b/Diagnostics/OutlookAttachView (as ADMIN).cmd index c2e9c389..442a5610 100644 --- a/Diagnostics/OutlookAttachView (as ADMIN).cmd +++ b/Diagnostics/OutlookAttachView (as ADMIN).cmd @@ -1,22 +1,51 @@ @echo off -:Init -setlocal enabledelayedexpansion -pushd %~dp0\..\.bin - :Flags for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Init +setlocal enabledelayedexpansion + :Extract -mkdir "OutlookAttachView" >nul 2>&1 -7-Zip\7z.exe x OutlookAttachView.7z -oOutlookAttachView -aos -pAbracadabra -bsp0 -bso0 +mkdir "%bin%\tmp" >nul 2>&1 +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "%bin%\7-Zip\7za.exe" "x OutlookAttachView.7z -otmp -aoa -pAbracadabra -bsp0 -bso0" /wait ping -n 1 127.0.0.1>nul :Launch -call "Scripts\Launch.cmd" Program "OutlookAttachView" "OutlookAttachView.exe" "" /admin +call "%bin%\Scripts\Launch.cmd" Program "%bin%\tmp" "OutlookAttachView.exe" "" /admin :Done popd -endlocal \ No newline at end of file +endlocal +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/OutlookAttachView.cmd b/Diagnostics/OutlookAttachView.cmd index 63f69fdb..b1c70bb6 100644 --- a/Diagnostics/OutlookAttachView.cmd +++ b/Diagnostics/OutlookAttachView.cmd @@ -1,22 +1,51 @@ @echo off -:Init -setlocal enabledelayedexpansion -pushd %~dp0\..\.bin - :Flags for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Init +setlocal enabledelayedexpansion + :Extract -mkdir "OutlookAttachView" >nul 2>&1 -7-Zip\7z.exe x OutlookAttachView.7z -oOutlookAttachView -aos -pAbracadabra -bsp0 -bso0 +mkdir "%bin%\tmp" >nul 2>&1 +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "%bin%\7-Zip\7za.exe" "x OutlookAttachView.7z -otmp -aoa -pAbracadabra -bsp0 -bso0" /wait ping -n 1 127.0.0.1>nul :Launch -call "Scripts\Launch.cmd" Program "OutlookAttachView" "OutlookAttachView.exe" "" +call "%bin%\Scripts\Launch.cmd" Program "%bin%\tmp" "OutlookAttachView.exe" "" :Done popd -endlocal \ No newline at end of file +endlocal +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Diagnostics/ProduKey.cmd b/Diagnostics/ProduKey.cmd index d8d4037e..48d5cd27 100644 --- a/Diagnostics/ProduKey.cmd +++ b/Diagnostics/ProduKey.cmd @@ -5,17 +5,33 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Init setlocal EnableDelayedExpansion -pushd %~dp0\..\.bin :ClearConfigs -if exist "ProduKey\*.*" ( - pushd ProduKey - if exist "ProduKey.cfg" del "ProduKey.cfg" - if exist "ProduKey64.cfg" del "ProduKey64.cfg" - popd -) +if not exist "%bin%\tmp" goto FindHives +pushd "%bin%\tmp" +if exist "ProduKey.cfg" del "ProduKey.cfg" +if exist "ProduKey64.cfg" del "ProduKey64.cfg" +popd :FindHives set choices=L @@ -64,13 +80,24 @@ if !index! neq 0 (set "args=/regfile !sw_hive!") :Extract cls -mkdir "ProduKey" >nul 2>&1 -7-Zip\7z.exe x ProduKey.7z -oProduKey -aos -pAbracadabra -bsp0 -bso0 +mkdir "%bin%\tmp" >nul 2>&1 +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "%bin%\7-Zip\7za.exe" "e ProduKey.7z -otmp -aoa -pAbracadabra -bsp0 -bso0" /wait ping -n 1 127.0.0.1>nul :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\ProduKey" "ProduKey.exe" "!args!" /admin +call "%bin%\Scripts\Launch.cmd" Program "%bin%\tmp" "ProduKey.exe" "!args!" /admin :Done -popd -endlocal \ No newline at end of file +endlocal +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/Auto Detect - Acer.cmd b/Drivers/Auto Detect - Acer.cmd index 62a7eade..fd89b742 100644 --- a/Drivers/Auto Detect - Acer.cmd +++ b/Drivers/Auto Detect - Acer.cmd @@ -5,7 +5,37 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch echo Waiting for software installation to finish... -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "Acer Serial Number Detect Tool.exe" "" /admin /wait -start "" "http://us.acer.com/ac/en/US/content/drivers" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "Acer Serial Number Detect Tool.exe" "" /admin /wait +start "" "http://us.acer.com/ac/en/US/content/drivers" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/Auto Detect - Dell.cmd b/Drivers/Auto Detect - Dell.cmd index 2a0c5073..4e17f9b5 100644 --- a/Drivers/Auto Detect - Dell.cmd +++ b/Drivers/Auto Detect - Dell.cmd @@ -5,7 +5,37 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch echo Waiting for software installation to finish... -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "Dell System Detect.exe" "" /admin /wait -start "" "http://www.dell.com/support/home/us/en/19/Eula/scan?sourcePage=J&scanType=TMC&loadSection=N&AppName=drivers&app=drivers" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "Dell System Detect.exe" "" /admin /wait +start "" "http://www.dell.com/support/home/us/en/19/Eula/scan?sourcePage=J&scanType=TMC&loadSection=N&AppName=drivers&app=drivers" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/Auto Detect - HP.cmd b/Drivers/Auto Detect - HP.cmd index 467eafac..42aad16a 100644 --- a/Drivers/Auto Detect - HP.cmd +++ b/Drivers/Auto Detect - HP.cmd @@ -5,7 +5,37 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch echo Waiting for software installation to finish... -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "HP Support Solutions Framework.exe" "" /admin /wait -start "" "http://support.hp.com/us-en/drivers/selfservice/identify" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "HP Support Solutions Framework.exe" "" /admin /wait +start "" "http://support.hp.com/us-en/drivers/selfservice/identify" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/Auto Detect - Intel.cmd b/Drivers/Auto Detect - Intel.cmd index 370284f4..76eb6853 100644 --- a/Drivers/Auto Detect - Intel.cmd +++ b/Drivers/Auto Detect - Intel.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "Intel Driver Update Utility.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "Intel Driver Update Utility.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/Auto Detect - Lenovo.cmd b/Drivers/Auto Detect - Lenovo.cmd index 029f7fb1..f251c339 100644 --- a/Drivers/Auto Detect - Lenovo.cmd +++ b/Drivers/Auto Detect - Lenovo.cmd @@ -5,7 +5,37 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch echo Waiting for software installation to finish... -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "Lenovo Service Bridge.exe" "" /admin /wait -start "" "http://support.lenovo.com/us/en/products?tabName=Downloads" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "Lenovo Service Bridge.exe" "" /admin /wait +start "" "http://support.lenovo.com/us/en/products?tabName=Downloads" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/Auto Detect - SDI.cmd b/Drivers/Auto Detect - SDI.cmd index baadc0b0..7bce2d13 100644 --- a/Drivers/Auto Detect - SDI.cmd +++ b/Drivers/Auto Detect - SDI.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers\SDI" "SDI.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers\SDI" "SDI.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/Auto Detect - Toshiba.cmd b/Drivers/Auto Detect - Toshiba.cmd index 73c12071..237d2681 100644 --- a/Drivers/Auto Detect - Toshiba.cmd +++ b/Drivers/Auto Detect - Toshiba.cmd @@ -5,7 +5,37 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch echo Waiting for software installation to finish... -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "Toshiba System Detect.exe" "" /admin /wait -start "" "http://support.toshiba.com/drivers" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "Toshiba System Detect.exe" "" /admin /wait +start "" "http://support.toshiba.com/drivers" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/GPU - AMD.cmd b/Drivers/GPU - AMD.cmd index 6b28befc..ff279924 100644 --- a/Drivers/GPU - AMD.cmd +++ b/Drivers/GPU - AMD.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "AMD Autodetect.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "AMD Autodetect.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/GPU - Gaming Evolved (AMD).cmd b/Drivers/GPU - Gaming Evolved (AMD).cmd index cf4be7dd..15023b5a 100644 --- a/Drivers/GPU - Gaming Evolved (AMD).cmd +++ b/Drivers/GPU - Gaming Evolved (AMD).cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "AMD Gaming Evolved.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "AMD Gaming Evolved.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/GPU - GeForce Experience.cmd b/Drivers/GPU - GeForce Experience.cmd index 4e77a021..65f3cc57 100644 --- a/Drivers/GPU - GeForce Experience.cmd +++ b/Drivers/GPU - GeForce Experience.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "GeForce Experience.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "GeForce Experience.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/SSD - ExpressCache.cmd b/Drivers/SSD - ExpressCache.cmd index 58372e12..cb015203 100644 --- a/Drivers/SSD - ExpressCache.cmd +++ b/Drivers/SSD - ExpressCache.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "SanDisk Express Cache.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "SanDisk Express Cache.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/SSD - Intel.cmd b/Drivers/SSD - Intel.cmd index db81d2de..381a4102 100644 --- a/Drivers/SSD - Intel.cmd +++ b/Drivers/SSD - Intel.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "Intel SSD Toolbox.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "Intel SSD Toolbox.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Drivers/SSD - Samsung.cmd b/Drivers/SSD - Samsung.cmd index cc1638da..eb3b56ae 100644 --- a/Drivers/SSD - Samsung.cmd +++ b/Drivers/SSD - Samsung.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\_Drivers" "Samsung Magician.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\_Drivers" "Samsung Magician.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Enter SafeMode.cmd b/Enter SafeMode.cmd index f8f69191..8d70a370 100644 --- a/Enter SafeMode.cmd +++ b/Enter SafeMode.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\.bin\Scripts\Launch.cmd" PSScript "%~dp0\.bin\Scripts" "enter_safemode.ps1" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "enter_safemode.ps1" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Exit SafeMode.cmd b/Exit SafeMode.cmd index c1ede008..98304eb9 100644 --- a/Exit SafeMode.cmd +++ b/Exit SafeMode.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\.bin\Scripts\Launch.cmd" PSScript "%~dp0\.bin\Scripts" "exit_safemode.ps1" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "exit_safemode.ps1" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Final Checklist.cmd b/Final Checklist.cmd index 7adda3b8..e183f8d5 100644 --- a/Final Checklist.cmd +++ b/Final Checklist.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\.bin\Scripts\Launch.cmd" PSScript "%~dp0\.bin\Scripts" "checklist.ps1" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "checklist.ps1" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2007/2007 Microsoft Office system (SP3).cmd b/Installers/Extras/Office/2007/2007 Microsoft Office system (SP3).cmd new file mode 100644 index 00000000..75e55ee8 --- /dev/null +++ b/Installers/Extras/Office/2007/2007 Microsoft Office system (SP3).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2007\2007 Microsoft Office system (SP3)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2007/Access 2007 (SP3).cmd b/Installers/Extras/Office/2007/Access 2007 (SP3).cmd new file mode 100644 index 00000000..2e89162b --- /dev/null +++ b/Installers/Extras/Office/2007/Access 2007 (SP3).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2007\Access 2007 (SP3)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2007/AccessRuntime2007.cmd b/Installers/Extras/Office/2007/AccessRuntime2007.cmd new file mode 100644 index 00000000..ae17aa1e --- /dev/null +++ b/Installers/Extras/Office/2007/AccessRuntime2007.cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2007\AccessRuntime2007.exe" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2007/Home and Student 2007 (SP3).cmd b/Installers/Extras/Office/2007/Home and Student 2007 (SP3).cmd new file mode 100644 index 00000000..aa2e5228 --- /dev/null +++ b/Installers/Extras/Office/2007/Home and Student 2007 (SP3).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2007\Home and Student 2007 (SP3)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2007/Outlook 2007 (SP3).cmd b/Installers/Extras/Office/2007/Outlook 2007 (SP3).cmd new file mode 100644 index 00000000..abd96542 --- /dev/null +++ b/Installers/Extras/Office/2007/Outlook 2007 (SP3).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2007\Outlook 2007 (SP3)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2007/Professional 2007 (SP3).cmd b/Installers/Extras/Office/2007/Professional 2007 (SP3).cmd new file mode 100644 index 00000000..09706022 --- /dev/null +++ b/Installers/Extras/Office/2007/Professional 2007 (SP3).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2007\Professional 2007 (SP3)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2007/Publisher 2007 (SP3).cmd b/Installers/Extras/Office/2007/Publisher 2007 (SP3).cmd new file mode 100644 index 00000000..3b40b3df --- /dev/null +++ b/Installers/Extras/Office/2007/Publisher 2007 (SP3).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2007\Publisher 2007 (SP3)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2007/Small Business 2007 (SP3).cmd b/Installers/Extras/Office/2007/Small Business 2007 (SP3).cmd new file mode 100644 index 00000000..96396082 --- /dev/null +++ b/Installers/Extras/Office/2007/Small Business 2007 (SP3).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2007\Small Business 2007 (SP3)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2010/Outlook 2010 (SP2) (x32).cmd b/Installers/Extras/Office/2010/Outlook 2010 (SP2) (x32).cmd new file mode 100644 index 00000000..79488c23 --- /dev/null +++ b/Installers/Extras/Office/2010/Outlook 2010 (SP2) (x32).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2010\Outlook 2010 (SP2) (x32)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2010/Outlook 2010 (SP2) (x64).cmd b/Installers/Extras/Office/2010/Outlook 2010 (SP2) (x64).cmd new file mode 100644 index 00000000..f9cff6e8 --- /dev/null +++ b/Installers/Extras/Office/2010/Outlook 2010 (SP2) (x64).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2010\Outlook 2010 (SP2) (x64)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2010/Professional Plus 2010 (SP2).cmd b/Installers/Extras/Office/2010/Professional Plus 2010 (SP2).cmd new file mode 100644 index 00000000..dc48db57 --- /dev/null +++ b/Installers/Extras/Office/2010/Professional Plus 2010 (SP2).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2010\Professional Plus 2010 (SP2)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2010/Publisher 2010 (SP2).cmd b/Installers/Extras/Office/2010/Publisher 2010 (SP2).cmd new file mode 100644 index 00000000..f48c6c56 --- /dev/null +++ b/Installers/Extras/Office/2010/Publisher 2010 (SP2).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2010\Publisher 2010 (SP2)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2010/Single Image 2010 (SP2).cmd b/Installers/Extras/Office/2010/Single Image 2010 (SP2).cmd new file mode 100644 index 00000000..b664cb9f --- /dev/null +++ b/Installers/Extras/Office/2010/Single Image 2010 (SP2).cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2010\Single Image 2010 (SP2)" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2013/Home and Business 2013.cmd b/Installers/Extras/Office/2013/Home and Business 2013.cmd new file mode 100644 index 00000000..31631733 --- /dev/null +++ b/Installers/Extras/Office/2013/Home and Business 2013.cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2013\Home and Business 2013" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2013/Home and Student 2013.cmd b/Installers/Extras/Office/2013/Home and Student 2013.cmd new file mode 100644 index 00000000..2b1413e0 --- /dev/null +++ b/Installers/Extras/Office/2013/Home and Student 2013.cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2013\Home and Student 2013" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2013/Professional Plus 2013.cmd b/Installers/Extras/Office/2013/Professional Plus 2013.cmd new file mode 100644 index 00000000..c193913e --- /dev/null +++ b/Installers/Extras/Office/2013/Professional Plus 2013.cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2013\Professional Plus 2013" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2016/Home and Business 2016.cmd b/Installers/Extras/Office/2016/Home and Business 2016.cmd new file mode 100644 index 00000000..54073827 --- /dev/null +++ b/Installers/Extras/Office/2016/Home and Business 2016.cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2016\Home and Business 2016" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Extras/Office/2016/Home and Student 2016.cmd b/Installers/Extras/Office/2016/Home and Student 2016.cmd new file mode 100644 index 00000000..1c266f16 --- /dev/null +++ b/Installers/Extras/Office/2016/Home and Student 2016.cmd @@ -0,0 +1,40 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Office "%bin%\Scripts" "2016\Home and Student 2016" + +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Installers/Office/2007/2007 Microsoft Office system (SP3).cmd b/Installers/Office/2007/2007 Microsoft Office system (SP3).cmd deleted file mode 100644 index f9e0be4a..00000000 --- a/Installers/Office/2007/2007 Microsoft Office system (SP3).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2007\2007 Microsoft Office system (SP3)" diff --git a/Installers/Office/2007/Access 2007 (SP3).cmd b/Installers/Office/2007/Access 2007 (SP3).cmd deleted file mode 100644 index 8d812e16..00000000 --- a/Installers/Office/2007/Access 2007 (SP3).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2007\Access 2007 (SP3)" diff --git a/Installers/Office/2007/AccessRuntime2007.cmd b/Installers/Office/2007/AccessRuntime2007.cmd deleted file mode 100644 index 05fc0113..00000000 --- a/Installers/Office/2007/AccessRuntime2007.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2007\AccessRuntime2007.exe" diff --git a/Installers/Office/2007/Home and Student 2007 (SP3).cmd b/Installers/Office/2007/Home and Student 2007 (SP3).cmd deleted file mode 100644 index 3f0d004b..00000000 --- a/Installers/Office/2007/Home and Student 2007 (SP3).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2007\Home and Student 2007 (SP3)" diff --git a/Installers/Office/2007/Outlook 2007 (SP3).cmd b/Installers/Office/2007/Outlook 2007 (SP3).cmd deleted file mode 100644 index 3c61f72b..00000000 --- a/Installers/Office/2007/Outlook 2007 (SP3).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2007\Outlook 2007 (SP3)" diff --git a/Installers/Office/2007/Professional 2007 (SP3).cmd b/Installers/Office/2007/Professional 2007 (SP3).cmd deleted file mode 100644 index 4cb81197..00000000 --- a/Installers/Office/2007/Professional 2007 (SP3).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2007\Professional 2007 (SP3)" diff --git a/Installers/Office/2007/Publisher 2007 (SP3).cmd b/Installers/Office/2007/Publisher 2007 (SP3).cmd deleted file mode 100644 index b080bfad..00000000 --- a/Installers/Office/2007/Publisher 2007 (SP3).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2007\Publisher 2007 (SP3)" diff --git a/Installers/Office/2007/Small Business 2007 (SP3).cmd b/Installers/Office/2007/Small Business 2007 (SP3).cmd deleted file mode 100644 index 23994162..00000000 --- a/Installers/Office/2007/Small Business 2007 (SP3).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2007\Small Business 2007 (SP3)" diff --git a/Installers/Office/2010/Outlook 2010 (SP2) (x32).cmd b/Installers/Office/2010/Outlook 2010 (SP2) (x32).cmd deleted file mode 100644 index 12ebe94e..00000000 --- a/Installers/Office/2010/Outlook 2010 (SP2) (x32).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2010\Outlook 2010 (SP2) (x32)" diff --git a/Installers/Office/2010/Outlook 2010 (SP2) (x64).cmd b/Installers/Office/2010/Outlook 2010 (SP2) (x64).cmd deleted file mode 100644 index 2b6f8d32..00000000 --- a/Installers/Office/2010/Outlook 2010 (SP2) (x64).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2010\Outlook 2010 (SP2) (x64)" diff --git a/Installers/Office/2010/Professional Plus 2010 (SP2).cmd b/Installers/Office/2010/Professional Plus 2010 (SP2).cmd deleted file mode 100644 index bd3f5b16..00000000 --- a/Installers/Office/2010/Professional Plus 2010 (SP2).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2010\Professional Plus 2010 (SP2)" diff --git a/Installers/Office/2010/Publisher 2010 (SP2).cmd b/Installers/Office/2010/Publisher 2010 (SP2).cmd deleted file mode 100644 index cfb9fe62..00000000 --- a/Installers/Office/2010/Publisher 2010 (SP2).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2010\Publisher 2010 (SP2)" diff --git a/Installers/Office/2010/Single Image 2010 (SP2).cmd b/Installers/Office/2010/Single Image 2010 (SP2).cmd deleted file mode 100644 index 9446dbe7..00000000 --- a/Installers/Office/2010/Single Image 2010 (SP2).cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2010\Single Image 2010 (SP2)" diff --git a/Installers/Office/2013/Home and Business 2013.cmd b/Installers/Office/2013/Home and Business 2013.cmd deleted file mode 100644 index 2a0b6d1b..00000000 --- a/Installers/Office/2013/Home and Business 2013.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2013\Home and Business 2013" diff --git a/Installers/Office/2013/Home and Student 2013.cmd b/Installers/Office/2013/Home and Student 2013.cmd deleted file mode 100644 index 6f623a16..00000000 --- a/Installers/Office/2013/Home and Student 2013.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2013\Home and Student 2013" diff --git a/Installers/Office/2013/Professional Plus 2013.cmd b/Installers/Office/2013/Professional Plus 2013.cmd deleted file mode 100644 index 0a2bfc90..00000000 --- a/Installers/Office/2013/Professional Plus 2013.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2013\Professional Plus 2013" diff --git a/Installers/Office/2016/Home and Business 2016.cmd b/Installers/Office/2016/Home and Business 2016.cmd deleted file mode 100644 index 244d6610..00000000 --- a/Installers/Office/2016/Home and Business 2016.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2016\Home and Business 2016" diff --git a/Installers/Office/2016/Home and Student 2016.cmd b/Installers/Office/2016/Home and Student 2016.cmd deleted file mode 100644 index 58eb86cb..00000000 --- a/Installers/Office/2016/Home and Student 2016.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Launch -call "%~dp0\..\..\..\.bin\Scripts\Launch.cmd" Office "%~dp0\..\..\..\.bin\Scripts" "2016\Home and Student 2016" diff --git a/Misc/Cmder (as ADMIN).cmd b/Misc/Cmder (as ADMIN).cmd index 38d69f5e..301da954 100644 --- a/Misc/Cmder (as ADMIN).cmd +++ b/Misc/Cmder (as ADMIN).cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\cmder_mini" "Cmder.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\cmder_mini" "Cmder.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/Cmder.cmd b/Misc/Cmder.cmd index 402bdf12..24d3a47e 100644 --- a/Misc/Cmder.cmd +++ b/Misc/Cmder.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\cmder_mini" "Cmder.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\cmder_mini" "Cmder.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/DeviceRemover.cmd b/Misc/DeviceRemover.cmd index afed341a..f5e611d3 100644 --- a/Misc/DeviceRemover.cmd +++ b/Misc/DeviceRemover.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "DeviceRemover.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "DeviceRemover.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/Explorer++.cmd b/Misc/Explorer++.cmd index b46e95dc..33177709 100644 --- a/Misc/Explorer++.cmd +++ b/Misc/Explorer++.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\Explorer++" "Explorer++.exe" "%userprofile%" /max \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\Explorer++" "Explorer++.exe" "%userprofile%" /max +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/Force Windows 10 Anniversary Update.url b/Misc/Force Windows 10 Anniversary Update.url new file mode 100644 index 00000000..bf734f64 --- /dev/null +++ b/Misc/Force Windows 10 Anniversary Update.url @@ -0,0 +1,5 @@ +[{000214A0-0000-0000-C000-000000000046}] +Prop3=19,11 +[InternetShortcut] +URL=https://support.microsoft.com/en-us/help/12387/windows-10-update-history +IDList= diff --git a/Hide Windows 10 Upgrade.reg b/Misc/Hide Windows 10 Upgrade.reg similarity index 100% rename from Hide Windows 10 Upgrade.reg rename to Misc/Hide Windows 10 Upgrade.reg diff --git a/Misc/Notepad2.cmd b/Misc/Notepad2.cmd index 3619ae49..0aba4152 100644 --- a/Misc/Notepad2.cmd +++ b/Misc/Notepad2.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\Notepad2" "Notepad2-Mod.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\Notepad2" "Notepad2-Mod.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/PerfMonitor2.cmd b/Misc/PerfMonitor2.cmd index ff1422f6..0542e7cd 100644 --- a/Misc/PerfMonitor2.cmd +++ b/Misc/PerfMonitor2.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\PerfMonitor2" "PerfMonitor2.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\PerfMonitor2" "PerfMonitor2.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/SysinternalsSuite.cmd b/Misc/SysinternalsSuite.cmd index 2e8ddfbc..16409fc9 100644 --- a/Misc/SysinternalsSuite.cmd +++ b/Misc/SysinternalsSuite.cmd @@ -5,6 +5,36 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :OpenFolder cd /d %~dp0 -start "" "explorer.exe" "%cd%\..\.bin\SysinternalsSuite" \ No newline at end of file +start "" "explorer.exe" "%bin%\SysinternalsSuite" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/WinDirStat.cmd b/Misc/WinDirStat.cmd index 27b8d494..6ce9c942 100644 --- a/Misc/WinDirStat.cmd +++ b/Misc/WinDirStat.cmd @@ -5,6 +5,24 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :ModifySettings reg add HKCU\Software\Seifert\WinDirStat\options /v followJunctionPoints /t REG_DWORD /d 0 /f >nul reg add HKCU\Software\Seifert\WinDirStat\options /v followMountPoints /t REG_DWORD /d 0 /f >nul @@ -20,4 +38,16 @@ reg add HKCU\Software\Seifert\WinDirStat\options /v useWdsLocale /t REG_DWORD /d reg add HKCU\Software\Seifert\WinDirStat\persistence /v showTreemap /t REG_DWORD /d 0 /f >nul :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\WinDirStat" "windirstat.exe" "" /admin /max \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\WinDirStat" "windirstat.exe" "" /admin /max +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/XMPlay.cmd b/Misc/XMPlay.cmd index f006797c..34de8e67 100644 --- a/Misc/XMPlay.cmd +++ b/Misc/XMPlay.cmd @@ -5,11 +5,41 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :RestoreDefaults del "xmplay.library" del "xmplay.library~" del "xmplay.pls" -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\XMPlay" "%~dp0\..\.bin\7-Zip\7z.exe" "e defaults.7z -aoa" +call "%bin%\Scripts\Launch.cmd" Program "%bin%\XMPlay" "%bin%\7-Zip\7za.exe" "e defaults.7z -aoa -bsp0 -bso0" :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\XMPlay" "xmplay.exe" "music.7z" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\XMPlay" "xmplay.exe" "music.7z" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Misc/_Update Kit.cmd b/Misc/_Update Kit.cmd index 65101ac9..5dfd7ba3 100644 --- a/Misc/_Update Kit.cmd +++ b/Misc/_Update Kit.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" PSScript "%~dp0\..\.bin\Scripts" "update_tools.ps1" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "update_tools.ps1" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/AdwCleaner.cmd b/Repairs/AdwCleaner.cmd index 4d23efbd..b15718dc 100644 --- a/Repairs/AdwCleaner.cmd +++ b/Repairs/AdwCleaner.cmd @@ -5,11 +5,40 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Copy -cd /d "%~dp0\..\.bin" set "prog=AdwCleaner.exe" -mkdir "tmp" >nul 2>&1 -copy /y "%prog%" "tmp\%prog%" +mkdir "%bin%\tmp" >nul 2>&1 +copy /y "%bin%\%prog%" "%bin%\tmp\%prog%" :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "%prog%" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\tmp" "%prog%" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/Autoruns.cmd b/Repairs/Autoruns.cmd index 04a660cc..d20eb876 100644 --- a/Repairs/Autoruns.cmd +++ b/Repairs/Autoruns.cmd @@ -5,6 +5,24 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :ModifySettings 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 @@ -18,4 +36,16 @@ reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\SysinternalsSuite" "Autoruns.exe" "-e" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\SysinternalsSuite" "Autoruns.exe" "-e" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/CHKDSK (Fix).cmd b/Repairs/CHKDSK (Fix).cmd index 3f0e5d85..1179aaa8 100644 --- a/Repairs/CHKDSK (Fix).cmd +++ b/Repairs/CHKDSK (Fix).cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" PSScript "%~dp0\..\.bin\Scripts" "check_disk_fix.ps1" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "check_disk_fix.ps1" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/CHKDSK.cmd b/Repairs/CHKDSK.cmd index fd8c169e..5ce89fad 100644 --- a/Repairs/CHKDSK.cmd +++ b/Repairs/CHKDSK.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" PSScript "%~dp0\..\.bin\Scripts" "check_disk.ps1" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "check_disk.ps1" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/Complete Internet Repair.cmd b/Repairs/Complete Internet Repair.cmd index 6287bdd6..39f0d5b4 100644 --- a/Repairs/Complete Internet Repair.cmd +++ b/Repairs/Complete Internet Repair.cmd @@ -5,14 +5,46 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as %log_dir% -call "%~dp0\..\.bin\Scripts\wk_info.cmd" +call "%bin%\Scripts\wk_info.cmd" :LaunchERUNT -rem Backup registry before running WinAIO +rem Backup registry first echo Backing up registry... -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\erunt" "ERUNT.EXE" "%log_dir%\Registry sysreg curuser otherusers" /admin /wait +call "%bin%\Scripts\Launch.cmd" Program "%bin%\erunt" "ERUNT.EXE" "%log_dir%\Registry sysreg curuser otherusers" /admin /wait -:LaunchWinAIO -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\Complete Internet Repair" "ComIntRep.exe" "" \ No newline at end of file +:Launch +call "%bin%\Scripts\Launch.cmd" Program "%bin%\Complete Internet Repair" "ComIntRep.exe" "" + +:Done +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/DISM.cmd b/Repairs/DISM.cmd index d74e49e2..b9dd7e24 100644 --- a/Repairs/DISM.cmd +++ b/Repairs/DISM.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" PSScript "%~dp0\..\.bin\Scripts" "dism.ps1" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "dism.ps1" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/ESET & KVRT.cmd b/Repairs/ESET & KVRT.cmd index 5bcf7426..ea4b0f17 100644 --- a/Repairs/ESET & KVRT.cmd +++ b/Repairs/ESET & KVRT.cmd @@ -5,12 +5,40 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :CreateQuarantineDir set "q_dir=%systemdrive%\WK\Quarantine\KVRT" mkdir "%q_dir%">nul 2>&1 -:LaunchESET -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "ESET.exe" "" +:Launch +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "ESET.exe" "" +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "KVRT.exe" "-accepteula -d %q_dir% -processlevel 3 -dontcryptsupportinfo -fixednames" +goto Exit -:LaunchKVRT -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "KVRT.exe" "-accepteula -d %q_dir% -processlevel 3 -dontcryptsupportinfo -fixednames" \ No newline at end of file +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/JRT.cmd b/Repairs/JRT.cmd index 4cf5d519..bdbd5c1c 100644 --- a/Repairs/JRT.cmd +++ b/Repairs/JRT.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "JRT.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "JRT.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/MBAM & SAS.cmd b/Repairs/MBAM & SAS.cmd deleted file mode 100644 index 45909798..00000000 --- a/Repairs/MBAM & SAS.cmd +++ /dev/null @@ -1,16 +0,0 @@ -@echo off - -:Flags -for %%f in (%*) do ( - if /i "%%f" == "/DEBUG" (@echo on) -) - -:Install -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "MBAM SAS.exe" "" /wait - -:LaunchMBAM -if exist "%programfiles%\Malwarebytes Anti-Malware\mbam.exe" (call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%programfiles%\Malwarebytes Anti-Malware" "mbam.exe" "") -if exist "%programfiles(x86)%\Malwarebytes Anti-Malware\mbam.exe" (call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%programfiles(x86)%\Malwarebytes Anti-Malware" "mbam.exe" "") - -:LaunchSAS -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%programfiles%\SUPERAntiSpyware" "SUPERAntiSpyware.exe" "" \ No newline at end of file diff --git a/Repairs/MBAM.cmd b/Repairs/MBAM.cmd new file mode 100644 index 00000000..374667ff --- /dev/null +++ b/Repairs/MBAM.cmd @@ -0,0 +1,43 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Install +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "MBAM.exe" "" /wait + +:Launch +if exist "%programfiles%\Malwarebytes Anti-Malware\mbam.exe" (call "%bin%\Scripts\Launch.cmd" Program "%programfiles%\Malwarebytes Anti-Malware" "mbam.exe" "") +if exist "%programfiles(x86)%\Malwarebytes Anti-Malware\mbam.exe" (call "%bin%\Scripts\Launch.cmd" Program "%programfiles(x86)%\Malwarebytes Anti-Malware" "mbam.exe" "") +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/RKill.cmd b/Repairs/RKill.cmd index a7492104..7e0fa97a 100644 --- a/Repairs/RKill.cmd +++ b/Repairs/RKill.cmd @@ -5,14 +5,31 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Init setlocal EnableDelayedExpansion color 1b title WK Launcher -pushd %~dp0\..\.bin :CheckHardLinks -pushd RKill +pushd "%bin%\RKill" for %%r in (explorer.exe iExplore.exe RKill.com RKill.scr uSeRiNiT.exe WiNlOgOn.exe) do ( if not exist "%%r" mklink /h %%r RKill.exe>nul 2>&1 ) @@ -20,11 +37,11 @@ popd :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as !log_dir! -call "%~dp0\..\.bin\Scripts\wk_info.cmd" +call "%bin%\Scripts\wk_info.cmd" :RKill echo Scanning system with RKill... -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "RKill\RKill.exe" "-l !log_dir!\rkill.log" +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "RKill\RKill.exe" "-l !log_dir!\rkill.log" choice /c YA /d A /t 300 /m "Did RKill run correctly? Press Y for Yes, A to run Alternative." if %errorlevel% equ 0 goto Abort if %errorlevel% equ 1 goto Done @@ -33,14 +50,14 @@ if %errorlevel% equ 2 goto RKillAlt :RKillAlt echo Scanning system with RKill... set "prog=RKill\explorer.exe" -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "RKill\explorer.exe" "-l !log_dir!\rkill.log" +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "RKill\explorer.exe" "-l !log_dir!\rkill.log" choice /c YM /d M /t 300 /m "Did RKill run correctly? Press Y for Yes, M to run manually." if %errorlevel% equ 0 goto Abort if %errorlevel% equ 1 goto Done if %errorlevel% equ 2 goto RKillManual :RKillManual -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\Explorer++" "Explorer++.exe" "%cd%\RKill" +call "%bin%\Scripts\Launch.cmd" Program "%bin%\Explorer++" "Explorer++.exe" "%cd%\RKill" goto Done :Abort @@ -50,12 +67,22 @@ echo Aborted. Try running an alternate version manually. echo. echo Press any key to exit... pause>nul +color +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color goto Exit :Done +color +endlocal goto Exit :Exit -popd -color -endlocal \ No newline at end of file +goto Exit diff --git a/Repairs/SAS (Deprecated).cmd b/Repairs/SAS (Deprecated).cmd new file mode 100644 index 00000000..7c0391e1 --- /dev/null +++ b/Repairs/SAS (Deprecated).cmd @@ -0,0 +1,42 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Install +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "SAS.exe" "" /wait + +:Launch +call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%programfiles%\SUPERAntiSpyware" "SUPERAntiSpyware.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/SFC Scan.cmd b/Repairs/SFC Scan.cmd index 8874dec1..b8fb4448 100644 --- a/Repairs/SFC Scan.cmd +++ b/Repairs/SFC Scan.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Console "%windir%\System32" "sfc.exe" "/scannow" "-new_console:c" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Console "%bin%\Scripts" "sfc_scan.cmd" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/Shortcut Cleaner (Testing).cmd b/Repairs/Shortcut Cleaner (Testing).cmd index 9468765a..0b779975 100644 --- a/Repairs/Shortcut Cleaner (Testing).cmd +++ b/Repairs/Shortcut Cleaner (Testing).cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "Shortcut Cleaner.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "Shortcut Cleaner.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Repairs/TDSSKiller.cmd b/Repairs/TDSSKiller.cmd index 7f8ebae3..e9cd3264 100644 --- a/Repairs/TDSSKiller.cmd +++ b/Repairs/TDSSKiller.cmd @@ -5,14 +5,44 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :CreateQuarantineDir set "q_dir=%systemdrive%\WK\Quarantine\TDSSKiller" mkdir "%q_dir%">nul 2>&1 :WKInfo rem Create WK\Info\YYYY-MM-DD and set path as %log_dir% -call "%~dp0\..\.bin\Scripts\wk_info.cmd" +call "%bin%\Scripts\wk_info.cmd" :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "TDSSKiller.exe" "-l %log_dir%\TDSSKiller.log -qpath %q_dir% -accepteula -accepteulaksn -dcexact -tdlfs" -rem call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin" "TDSSKiller.exe" "-l %log_dir%\TDSSKiller.log -qpath %q_dir% -accepteula -accepteulaksn -dcexact -qsus -tdlfs" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%" "TDSSKiller.exe" "-l %log_dir%\TDSSKiller.log -qpath %q_dir% -accepteula -accepteulaksn -dcexact -tdlfs" +rem call "%bin%\Scripts\Launch.cmd" Program "%bin%" "TDSSKiller.exe" "-l %log_dir%\TDSSKiller.log -qpath %q_dir% -accepteula -accepteulaksn -dcexact -qsus -tdlfs" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Reset Browsers.cmd b/Reset Browsers.cmd index 531f64ca..ef2e01e6 100644 --- a/Reset Browsers.cmd +++ b/Reset Browsers.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\.bin\Scripts\Launch.cmd" PSScript "%~dp0\.bin\Scripts" "reset_browsers.ps1" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "reset_browsers.ps1" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/SW Diagnostics.cmd b/SW Diagnostics.cmd index b2e5020e..5ff8545f 100644 --- a/SW Diagnostics.cmd +++ b/SW Diagnostics.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\.bin\Scripts\Launch.cmd" PSScript "%~dp0\.bin\Scripts" "diagnostics.ps1" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" PSScript "%bin%\Scripts" "diagnostics.ps1" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Uninstallers/IObit Uninstaller.cmd b/Uninstallers/IObit Uninstaller.cmd index 56836147..decc2a74 100644 --- a/Uninstallers/IObit Uninstaller.cmd +++ b/Uninstallers/IObit Uninstaller.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\IObitUninstaller" "IObitUninstaler.exe" "" /admin \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\IObitUninstaller" "IObitUninstaler.exe" "" /admin +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Uninstallers/MyUninstaller.cmd b/Uninstallers/MyUninstaller.cmd new file mode 100644 index 00000000..33706c24 --- /dev/null +++ b/Uninstallers/MyUninstaller.cmd @@ -0,0 +1,39 @@ +@echo off + +:Flags +for %%f in (%*) do ( + if /i "%%f" == "/DEBUG" (@echo on) +) + +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + +:Launch +call "%bin%\Scripts\Launch.cmd" Program "%bin%\MyUninstaller" "myuninst.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Uninstallers/PC Decrapifier (Deprecated).cmd b/Uninstallers/PC Decrapifier (Deprecated).cmd index 2c8234f6..42ce7eb9 100644 --- a/Uninstallers/PC Decrapifier (Deprecated).cmd +++ b/Uninstallers/PC Decrapifier (Deprecated).cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\PC Decrapifier 2.2.8" "pc-decrapifier.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\PC Decrapifier 2.2.8" "pc-decrapifier.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Uninstallers/Removal Tools.cmd b/Uninstallers/Removal Tools.cmd index c544049b..07ef4276 100644 --- a/Uninstallers/Removal Tools.cmd +++ b/Uninstallers/Removal Tools.cmd @@ -5,7 +5,37 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -pushd "%~dp0\..\.bin\_Removal Tools" -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%windir%" "explorer.exe" "%cd%" -popd \ No newline at end of file +pushd "%bin%\_Removal Tools" +call "%bin%\Scripts\Launch.cmd" Program "%windir%" "explorer.exe" "%cd%" +popd +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit diff --git a/Uninstallers/Revo Uninstaller.cmd b/Uninstallers/Revo Uninstaller.cmd index 30d1046d..33882f1a 100644 --- a/Uninstallers/Revo Uninstaller.cmd +++ b/Uninstallers/Revo Uninstaller.cmd @@ -5,5 +5,35 @@ for %%f in (%*) do ( if /i "%%f" == "/DEBUG" (@echo on) ) +:FindBin +set bin= +pushd "%~dp0" +:FindBinInner +if exist ".bin" ( + set "bin=%cd%\.bin" + goto FindBinDone +) +if "%~d0\" == "%cd%" ( + goto FindBinDone +) else ( + cd .. +) +goto FindBinInner +:FindBinDone +popd +if not defined bin goto ErrorNoBin + :Launch -call "%~dp0\..\.bin\Scripts\Launch.cmd" Program "%~dp0\..\.bin\Revo Uninstaller" "Revouninstaller.exe" "" \ No newline at end of file +call "%bin%\Scripts\Launch.cmd" Program "%bin%\Revo Uninstaller" "Revouninstaller.exe" "" +goto Exit + +:ErrorNoBin +color 4e +echo ".bin" folder not found, aborting script. +echo. +echo Press any key to exit... +pause>nul +color +goto Exit + +:Exit