From f2ed843224985c4cecbc6eb94c269beabfd77fc7 Mon Sep 17 00:00:00 2001
From: joshuacline <114229084+joshuacline@users.noreply.github.com>
Date: Wed, 4 Dec 2024 12:39:59 -0700
Subject: [PATCH] Add files via upload

---
 tools.list  |  9 ---------
 tweaks.base | 19 -------------------
 windick.cmd | 20 ++++++++++----------
 3 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/tools.list b/tools.list
index 5a221d7..ff2511e 100644
--- a/tools.list
+++ b/tools.list
@@ -138,15 +138,6 @@ MULTI-LIST
 [CONFIRM][ ][ ]
 [COMMAND][SFC /SCANNOW][CMD][IA]
 
-[GROUP][Miscellaneous Tasks][Install Autoboot Service][%COLOR2%        * Use this option with caution]
-[COMMANDQ][ECHO.   Autoboot service sets the following boot to recovery upon boot.][CMD][IA]
-[CONFIRM][ ][ ]
-[COMMAND][windick.cmd -autoboot -install][CMD][IA]
-
-[GROUP][Miscellaneous Tasks][Remove Autoboot Service][%COLOR2%        * Use this option with caution]
-[CONFIRM][ ][ ]
-[COMMAND][windick.cmd -autoboot -remove][CMD][IA]
-
 [GROUP][Miscellaneous Tasks][Sysprep Generalize with OOBE enabled][%COLOR2%        * Use this option with caution]
 [COMMANDQ][ECHO.  This will generalize the CURRENT windows installation and enable OOBE.][CMD][IA]
 [CONFIRM][ ][ ]
diff --git a/tweaks.base b/tweaks.base
index 38148d1..90175d9 100644
--- a/tweaks.base
+++ b/tweaks.base
@@ -333,15 +333,6 @@ BASE-GROUP
 [COMMAND][wmic pagefileset where name="D:\\pagefile.sys" delete][CMD][SC]
 [COMMAND][wmic pagefileset where name="E:\\pagefile.sys" delete][CMD][SC]
 
-[GROUP][Miscellaneous][Schedule next boot Recovery][%COLOR4%        * item will be scheduled for %COLOR7%RunOnce]
-[COMMANDQ][START CMD /C "%PROG_SOURCE%\windick.cmd" -nextboot -recovery][CMD][RO]
-[GROUP][Miscellaneous][Schedule next boot VHDX][%COLOR4%        * item will be scheduled for %COLOR7%RunOnce]
-[COMMANDQ][START CMD /C "%PROG_SOURCE%\windick.cmd" -nextboot -vhdx][CMD][RO]
-[GROUP][Miscellaneous][Install autoboot switcher service][%COLOR4%        * item will be scheduled for %COLOR7%RunOnce]
-[COMMANDQ][IF EXIST "%PROG_SOURCE%\autoboot.cmd" START CMD /C "%PROG_SOURCE%\windick.cmd" -autoboot -install][CMD][RO]
-[COMMANDQ][IF EXIST "%PROG_SOURCE%\autoboot.cmd" COPY /Y "%PROG_SOURCE%\autoboot.cmd" "%DRVTAR%\$"%}%NUL][CMD][IA]
-[COMMANDQ][IF NOT EXIST "%PROG_SOURCE%\autoboot.cmd" ECHO. ERROR: autoboot.cmd does not exist in folder.][CMD][IA]
-
 [GROUP][Import from program\cache folder][Import wallpaper.jpg][%COLOR4%        * wallpaper.jpg must be in folder]
 [COMMANDQ][ECHO. Importing wallpaper.jpg...][CMD][IA]
 [COMMANDQ][IF EXIST "%CACHE_FOLDER%\wallpaper.jpg" TAKEOWN /F "%WINTAR%\web\wallpaper\Windows\img0.jpg"%}%NUL][CMD][IA]
@@ -399,13 +390,3 @@ BASE-GROUP
 [GROUP][DISM Operations][Delete WinSxS folder][%COLOR2%        * this will break several things permanently.]
 [COMMANDQ][ECHO. Executing Delete WinSxS folder...][CMD][IA]
 [WINSXS][Delete WinSxS folder][DELETE][IA]
-
-[GROUP][Examples][Create new folder at base of drive target]
-[COMMAND][MD "%DRVTAR%\new_folder_test"][CMD][IA]
-[GROUP][Examples][Takeown + Grant permissions to new folder]
-[COMMAND][takeown /f "%DRVTAR%\new_folder_test"][CMD][IA]
-[COMMAND][icacls "%DRVTAR%\new_folder_test" /grant %USERNAME%:F][CMD][IA]
-[GROUP][Examples][Copy file from main folder to new folder]
-[COMMAND][copy "%PROG_SOURCE%\settings.ini" "%DRVTAR%\new_folder_test"][CMD][IA]
-[GROUP][Examples][Copy file from pkx package folder to new folder][%COLOR4%        * when used in an pkx pack]
-[COMMAND][copy "%PKX_FOLDER%\package.lst" "%DRVTAR%\new_folder_test"][CMD][IA]
\ No newline at end of file
diff --git a/windick.cmd b/windick.cmd
index c9b4794..8283bed 100644
--- a/windick.cmd
+++ b/windick.cmd
@@ -301,7 +301,7 @@ IF NOT DEFINED HOST_FOLDER SET "HOST_FOLDER=$"
 IF NOT DEFINED HOST_HIDE SET "HOST_HIDE=DISABLED"
 IF NOT DEFINED ADDFILE_0 SET "ADDFILE_0=LIST\tweaks.base"
 IF NOT DEFINED ADDFILE_1 SET "ADDFILE_1=LIST\tools.list"
-IF NOT DEFINED HOTKEY_1 SET "HOTKEY_1=CMD"&&SET "SHORT_1=CMD.EXE"
+IF NOT DEFINED HOTKEY_1 SET "HOTKEY_1=CMD"&&SET "SHORT_1=EXIT"
 IF NOT DEFINED HOTKEY_2 SET "HOTKEY_2=NOTE"&&SET "SHORT_2=NOTEPAD.EXE"
 IF NOT DEFINED HOTKEY_3 SET "HOTKEY_3=REG"&&SET "SHORT_3=REGEDIT.EXE"
 IF NOT DEFINED APPX_SKIP SET "APPX_SKIP=Microsoft.DesktopAppInstaller Microsoft.VCLibs.140.00"
@@ -469,11 +469,11 @@ IF "%ARG1%"=="-FILEMGR" IF "%ARG2%"=="-GRANT" IF NOT EXIST "%ARG3%" ECHO.%ARG3%
 IF "%ARG1%"=="-FILEMGR" IF "%ARG2%"=="-GRANT" IF DEFINED ARG3 IF EXIST "%ARG3%" SET "$PICK=%ARG3%"&&SET "NO_PAUSE=1"&&CALL:FMGR_OWN
 IF "%ARG1%"=="-NEXTBOOT" IF NOT "%ARG2%"=="-RECOVERY" IF NOT "%ARG2%"=="-VHDX" ECHO.Valid options are -recovery and -vhdx
 IF "%ARG1%"=="-NEXTBOOT" FOR %%a in (VHDX RECOVERY) DO (IF "%ARG2%"=="-%%a" SET "BOOT_TARGET=%%a"&&CALL:BOOT_TOGGLE)
-IF "%ARG1%"=="-NEXTBOOT" IF DEFINED NEXT_BOOT CALL ECHO.Next boot is %NEXT_BOOT%
-IF "%ARG1%"=="-NEXTBOOT" IF NOT DEFINED NEXT_BOOT CALL ECHO. %XLR4%ERROR:%#$% The boot environment is not installed on this disk.
+IF "%ARG1%"=="-NEXTBOOT" IF DEFINED NEXT_BOOT ECHO.Next boot is %NEXT_BOOT%
+IF "%ARG1%"=="-NEXTBOOT" IF NOT DEFINED NEXT_BOOT ECHO. %XLR4%ERROR:%#$% The boot environment is not installed on this system.
 IF "%ARG1%"=="-AUTOBOOT" IF NOT "%ARG2%"=="-INSTALL" IF NOT "%ARG2%"=="-REMOVE" ECHO.Valid options are -install and -remove
-IF "%ARG1%"=="-AUTOBOOT" IF "%ARG2%"=="-REMOVE" SET "BOOTSVC=REMOVE"&&CALL:AUTOBOOT_SVC&ECHO.AutoBoot switcher is removed
-IF "%ARG1%"=="-AUTOBOOT" IF "%ARG2%"=="-INSTALL" SET "BOOTSVC=INSTALL"&&CALL:AUTOBOOT_SVC&ECHO.AutoBoot switcher is installed
+IF "%ARG1%"=="-AUTOBOOT" IF "%ARG2%"=="-REMOVE" SET "BOOTSVC=REMOVE"&&CALL:AUTOBOOT_SVC
+IF "%ARG1%"=="-AUTOBOOT" IF "%ARG2%"=="-INSTALL" SET "BOOTSVC=INSTALL"&&CALL:AUTOBOOT_SVC
 IF "%ARG1%"=="-BOOTMAKER" CALL:COMMAND_BOOTMAKER
 IF "%ARG1%"=="-DISKMGR" CALL:COMMAND_DISKMGR
 IF "%ARG1%"=="-IMAGEMGR" CALL:COMMAND_IMAGEMGR
@@ -595,7 +595,7 @@ EXIT /B
 CLS&&CALL:SETS_HANDLER&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                        Settings Configuration&&ECHO.
 ECHO. (%##%-%#$%) Color Shift (%##%+%#$%)&&ECHO. (%##%1%#$%) Pad Type          %#@%PAD %PAD_TYPE%%#$%&&ECHO. (%##%2%#$%) Pad Size          %#@%%PAD_SIZE%%#$%&&ECHO. (%##%3%#$%) Pad Sequence      %#@%%PAD_SEQ%%#$%&&CALL ECHO. (%##%4%#$%) Text Color        %#@%COLOR %%XLR%TXT_COLOR%%%%TXT_COLOR%%#$%&&CALL ECHO. (%##%5%#$%) Accent Color      %#@%COLOR %%XLR%ACC_COLOR%%%%ACC_COLOR%%#$%&&CALL ECHO. (%##%6%#$%) Button Color      %#@%COLOR %%XLR%BTN_COLOR%%%%BTN_COLOR%%#$%&&CALL ECHO. (%##%7%#$%) Pad Box           %#@%%PAD_BOX%%#$%&&ECHO. (%##%8%#$%) Folder Layout     %#@%%FOLDER_MODE%%#$%&&ECHO. (%##%9%#$%) Shortcuts         %#@%%SHORTCUTS%%#$%&&IF "%PROG_MODE%"=="RAMDISK" ECHO. (%##%10%#$%) Update&&ECHO. (%##%11%#$%) Host Hide        %#@%%HOST_HIDE%%#$%
 ECHO. (%##%@%#$%) Clear Settings&&ECHO. (%##%*%#$%) Enable Custom Menu&&ECHO.&&CALL:BOXB1&&CALL:PAD_LINE
-IF "%SHORTCUTS%"=="ENABLED" CALL ECHO. [%#@%SHORTCUTS%#$%]  (%##%X%#$%)Slot %#@%%SHORT_SLOT%%#$%   (%##%A%#$%)ssign %#@%%%SHORT_%SHORT_SLOT%%%%#$%   (%##%H%#$%)otKey %#@%%%HOTKEY_%SHORT_SLOT%%%%#$%&&CALL:PAD_LINE
+IF "%SHORTCUTS%"=="ENABLED" CALL ECHO. [%#@%SHORTCUTS%#$%]  (%##%X%#$%)Slot %#@%%SHORT_SLOT%%#$%   (%##%H%#$%)otKey %#@%%%HOTKEY_%SHORT_SLOT%%%%#$%   (%##%A%#$%)ssign %#@%%%SHORT_%SHORT_SLOT%%%%#$% &&CALL:PAD_LINE
 CALL:PAD_PREV&&CALL:MENU_SELECT
 IF NOT DEFINED SELECT GOTO:MAIN_MENU
 IF DEFINED HOST_ERROR GOTO:MAIN_MENU
@@ -686,10 +686,10 @@ CALL START %SHORT_RUN%
 EXIT /B
 :AUTOBOOT_SVC
 CALL:BOOT_QUERY
-IF NOT DEFINED BOOT_OK EXIT /B
-IF "%BOOTSVC%"=="INSTALL" SET "BOOTSVC="&&SC CREATE AutoBoot binpath="%WinDir%\SYSTEM32\CMD.EXE /C BCDEDIT.EXE /displayorder %GUID_TMP% /addfirst" start=auto>NUL 2>&1
-IF "%BOOTSVC%"=="REMOVE" SET "BOOTSVC="&&SC DELETE AutoBoot>NUL 2>&1
-EXIT /B
+IF NOT DEFINED BOOT_OK ECHO. %XLR4%ERROR:%#$% The boot environment is not installed on this system.&&EXIT /B
+IF "%BOOTSVC%"=="INSTALL" ECHO. Recovery switcher service is installed.&&SC CREATE AutoBoot binpath="%WinDir%\SYSTEM32\CMD.EXE /C BCDEDIT.EXE /displayorder %GUID_TMP% /addfirst" start=auto>NUL 2>&1
+IF "%BOOTSVC%"=="REMOVE" ECHO.Recovery switcher service is removed.&&SC DELETE AutoBoot>NUL 2>&1
+SET "BOOTSVC="&&EXIT /B
 :UPDATE_RECOVERY
 SET "PROG_NAME=windick"&&CLS&&CALL:SETS_HANDLER&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                           Recovery Update&&ECHO.&&ECHO. (%##%1%#$%) Program  (%##%*%#$%) Test&&ECHO. (%##%2%#$%) Recovery Wallpaper&&ECHO. (%##%3%#$%) Recovery Password&&ECHO. (%##%4%#$%) Boot Media&&ECHO. (%##%5%#$%) Host Folder&&ECHO. (%##%6%#$%) EFI Files&&ECHO.&&CALL:BOXB1&&CALL:PAD_LINE&&CALL:PAD_PREV&&CALL:MENU_SELECT
 IF DEFINED HOST_ERROR GOTO:MAIN_MENU