Add files via upload

joshuacline · Nov 15, 2024 · 0e82f79 · 0e82f79
1 parent 2941d78
commit 0e82f79
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/windick.cmd b/windick.cmd
@@ -386,7 +386,7 @@ EXIT /B
 CLS&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                           Image Processing&&ECHO.&&ECHO.  %#@%AVAILABLE INDEXs:%#$%&&ECHO.&&SET "INDEX_TMP="&&SET "NAME_TMP="&&FOR /F "TOKENS=1-9 DELIMS=: " %%a in ('DISM /ENGLISH /Get-ImageInfo /ImageFile:"%IMAGE_FOLDER%\%WIM_SOURCE%"') DO (
 IF "%%a"=="Index" CALL SET "INDEX_TMP=%%b"
 IF "%%a"=="Name" CALL SET "NAME_TMP=%%b %%c %%d %%e %%f %%g %%h %%i"&&CALL:WIM_INDEX_LIST)
-IF NOT DEFINED INDEX_TMP ECHO.ERROR&&SET "ERROR=1"&&EXIT /B
+IF NOT DEFINED INDEX_TMP ECHO.%XLR2%ERROR%#$%&&SET "ERROR=1"&&EXIT /B
 SET "INDEX_TMP="&&SET "NAME_TMP="&&ECHO.&&CALL:BOXB1&&CALL:PAD_LINE&&CALL:PAD_PREV&&CALL:MENU_SELECT
 IF NOT DEFINED SELECT SET "ERROR=1"&&EXIT /B
 SET "WIM_INDEX=%SELECT%"&&CALL:WIM_INDEX_QUERY
@@ -396,8 +396,7 @@ EXIT /B
 ECHO. ( %##%%INDEX_TMP%%#$% ) %NAME_TMP%
 EXIT /B
 :WIM_INDEX_QUERY
-SET "WIM_DESC="&&FOR /F "TOKENS=1-5 DELIMS=<> " %%a in ('DISM /ENGLISH /Get-ImageInfo /ImageFile:"%IMAGE_FOLDER%\%WIM_SOURCE%" /Index:%WIM_INDEX% 2^>NUL') DO (IF "%%a"=="Edition" SET "WIM_DESC=%%c"
-IF "%%a"=="Languages" IF NOT "%%c"=="" SET "WIM_SOURCE=SELECT")
+SET "WIM_DESC="&&FOR /F "TOKENS=1-5 DELIMS=<> " %%a in ('DISM /ENGLISH /Get-ImageInfo /ImageFile:"%IMAGE_FOLDER%\%WIM_SOURCE%" /Index:%WIM_INDEX% 2^>NUL') DO (IF "%%a"=="Edition" SET "WIM_DESC=%%c")
 IF NOT DEFINED WIM_DESC SET "WIM_INDEX=1"&&SET "WIM_DESC=NULL"
 EXIT /B
 :BCD_MENU
@@ -1036,8 +1035,6 @@ EXIT /B
 SET "SOURCE_LOCATION="&&FOR %%a in (A B C D E F G H I J K L N O P Q R S T U W Y Z) DO (IF EXIST "%%a:\sources\boot.wim" SET "SOURCE_LOCATION=%%a:\sources")
 IF NOT DEFINED WIM_XLVL SET "WIM_XLVL=FAST"
 IF NOT DEFINED VHDX_SIZE SET "VHDX_SIZE=25600"
-SET "PATH_S="&&IF NOT "%PATH_SOURCE%"=="SELECT" SET "PATH_S=Volume "
-SET "PATH_T="&&IF NOT "%PATH_TARGET%"=="SELECT" SET "PATH_T=Volume "
 SET "PROC_DISPLAY="&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                           Image Processing&&ECHO.
 IF DEFINED SOURCE_LOCATION ECHO.  (%##%-%#$%)Import Boot  %##%Windows Installation Media Detected%#$%  Import WIM(%##%+%#$%)&&ECHO.
 IF NOT DEFINED SOURCE_LOCATION IF NOT EXIST "%IMAGE_FOLDER%\*.WIM" ECHO.   Insert a Windows Disc/ISO/USB to Import Installation/Boot Media&&ECHO.
@@ -1049,12 +1046,12 @@ IF "%PROC_DISPLAY%"=="1" SET "MENUT0=  %#@%AVAILABLE %#@%%SOURCE_TYPE%s%#$% (%##
 IF "%PROC_DISPLAY%"=="2" ECHO.  %#@%AVAILABLE %#@%%SOURCE_TYPE%s%#$% (%##%X%#$%) %#@%%TARGET_TYPE%s%#$%:%#$%&&ECHO.&&FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF EXIST "%%G:\" ECHO.   %%G:)
 IF "%PROC_DISPLAY%"=="2" SET "BLIST=WIM"&&CALL:FILE_LIST
 ECHO.&&CALL:BOXB1&&CALL:PAD_LINE
-IF "%SOURCE_TYPE%"=="PATH" ECHO. [%#@%PATH%#$%] (%##%S%#$%)ource %#@%%PATH_S%%PATH_SOURCE%%#$%&&CALL:PAD_LINE
+IF "%SOURCE_TYPE%"=="PATH" ECHO. [%#@%PATH%#$%] (%##%S%#$%)ource %#@%%PATH_SOURCE%%#$%&&CALL:PAD_LINE
 IF "%SOURCE_TYPE%"=="VHDX" ECHO. [%#@%VHDX%#$%] (%##%S%#$%)ource %#@%%VHDX_SOURCE%%#$%&&CALL:PAD_LINE
 IF "%SOURCE_TYPE%"=="WIM" ECHO. [%#@%WIM%#$%] (%##%S%#$%)ource %#@%%WIM_SOURCE%%#$%   (%##%I%#$%)ndex %#@%%WIM_INDEX%%#$%   Edition: %#@%%WIM_DESC%%#$%&&CALL:PAD_LINE
 IF "%TARGET_TYPE%"=="VHDX" ECHO. [%#@%VHDX%#$%] (%##%T%#$%)arget %#@%%VHDX_TARGET%%#$%          (%##%G%#$%)o^^!      (%##%V%#$%)disk Size %#@%%VHDX_SIZE%MB%#$%&&CALL:PAD_LINE
 IF "%TARGET_TYPE%"=="WIM" ECHO. [%#@%WIM%#$%] (%##%T%#$%)arget %#@%%WIM_TARGET%%#$%           (%##%G%#$%)o^^!            (%##%Z%#$%) Lvl %#@%%WIM_XLVL%%#$%&&CALL:PAD_LINE
-IF "%TARGET_TYPE%"=="PATH" ECHO. [%#@%PATH%#$%] (%##%T%#$%)arget %#@%%PATH_T%%PATH_TARGET%%#$%          (%##%G%#$%)o^^!&&CALL:PAD_LINE
+IF "%TARGET_TYPE%"=="PATH" ECHO. [%#@%PATH%#$%] (%##%T%#$%)arget %#@%%PATH_TARGET%%#$%          (%##%G%#$%)o^^!&&CALL:PAD_LINE
 CALL:PAD_PREV&&CALL:MENU_SELECT
 IF NOT DEFINED SELECT GOTO:MAIN_MENU
 IF DEFINED HOST_ERROR GOTO:MAIN_MENU
@@ -1143,27 +1140,24 @@ SET "CHECK=NUM"&&SET "CHECK_VAR=%VHDX_SIZE%"&&CALL:CHECK
 IF DEFINED ERROR SET "VHDX_SIZE=25600"
 EXIT /B
 :IMAGEPROC_TARGET
-IF "%TARGET_TYPE%"=="PATH" CLS&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                           Image Processing&&ECHO.&&ECHO.  %#@%AVAILABLE PATHs:%#$%&&ECHO.&&FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF EXIST "%%G:\" ECHO. ^( %##%%%G%#$% ^) Volume %%G:)
+IF "%TARGET_TYPE%"=="PATH" CLS&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                         Enter the target PATH &&ECHO.&&ECHO.  %#@%AVAILABLE PATHs:%#$%&&ECHO.&&FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF EXIST "%%G:\" ECHO. ^( %##%%%G%#$% ^) Volume %%G:)
 IF "%TARGET_TYPE%"=="PATH" ECHO.&&CALL:BOXB1&&CALL:PAD_LINE&&CALL:PAD_PREV&&SET "PROMPT_SET=PATH_LETTER"&&CALL:PROMPT_SET
-IF "%TARGET_TYPE%"=="PATH" IF DEFINED PATH_LETTER FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF "%PATH_LETTER%"=="%%G" IF EXIST "%%G:\" SET "PATH_TARGET=%PATH_LETTER%:")
+IF "%TARGET_TYPE%"=="PATH" IF DEFINED PATH_LETTER FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF "%PATH_LETTER%"=="%%G" IF EXIST "%%G:\" SET "PATH_TARGET=%PATH_LETTER%:"&&EXIT /B)
+IF "%TARGET_TYPE%"=="PATH" IF DEFINED PATH_LETTER SET "INPUT=%PATH_LETTER%"&&SET "OUTPUT=PATH_TARGET"&&CALL:SLASHER
 IF "%TARGET_TYPE%"=="PATH" IF NOT DEFINED PATH_LETTER SET "PATH_TARGET="
-IF NOT "%TARGET_TYPE%"=="PATH" CALL:PAD_LINE&&CALL:BOXT1&&ECHO.&&ECHO.                        Enter name of new .%TARGET_TYPE%&&ECHO.&&CALL:BOXB1&&CALL:PAD_LINE&&CALL:PAD_PREV
-IF "%TARGET_TYPE%"=="WIM" SET "PROMPT_SET=WIM_TARGET"&&SET "PROMPT_ANY=1"&&CALL:PROMPT_SET
-IF "%TARGET_TYPE%"=="WIM" IF DEFINED WIM_TARGET SET "WIM_TARGET=%WIM_TARGET%.wim"
-IF "%TARGET_TYPE%"=="WIM" IF NOT DEFINED WIM_TARGET SET "ERROR=1"
-IF "%TARGET_TYPE%"=="VHDX" SET "PROMPT_SET=VHDX_TARGET"&&SET "PROMPT_ANY=1"&&CALL:PROMPT_SET
-IF "%TARGET_TYPE%"=="VHDX" IF DEFINED VHDX_TARGET SET "VHDX_TARGET=%VHDX_TARGET%.vhdx"
-IF "%TARGET_TYPE%"=="VHDX" IF NOT DEFINED VHDX_TARGET SET "ERROR=1"
+IF NOT "%TARGET_TYPE%"=="PATH" CALL:PAD_LINE&&CALL:BOXT1&&ECHO.&&ECHO.                        Enter name of new .%TARGET_TYPE%&&ECHO.&&CALL:BOXB1&&CALL:PAD_LINE&&CALL:PAD_PREV&&SET "PROMPT_SET=SELECTX"&&SET "PROMPT_ANY=1"&&CALL:PROMPT_SET
+IF NOT "%TARGET_TYPE%"=="PATH" IF NOT DEFINED SELECTX SET "%TARGET_TYPE%_TARGET="
+IF "%TARGET_TYPE%"=="WIM" IF DEFINED SELECTX SET "WIM_TARGET=%SELECTX%.wim"
+IF "%TARGET_TYPE%"=="VHDX" IF DEFINED SELECTX SET "VHDX_TARGET=%SELECTX%.vhdx"
 EXIT /B
 :IMAGEPROC_SOURCE
-IF "%SOURCE_TYPE%"=="PATH" CLS&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                           Image Processing&&ECHO.&&ECHO.  %#@%AVAILABLE PATHs:%#$%&&ECHO.&&FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF EXIST "%%G:\" ECHO. ^( %##%%%G%#$% ^) Volume %%G:)
+IF "%SOURCE_TYPE%"=="PATH" CLS&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                         Enter the source PATH &&ECHO.&&ECHO.  %#@%AVAILABLE PATHs:%#$%&&ECHO.&&FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF EXIST "%%G:\" ECHO. ^( %##%%%G%#$% ^) Volume %%G:)
 IF "%SOURCE_TYPE%"=="PATH" ECHO.&&CALL:BOXB1&&CALL:PAD_LINE&&CALL:PAD_PREV&&SET "PROMPT_SET=PATH_LETTER"&&CALL:PROMPT_SET
-IF "%SOURCE_TYPE%"=="PATH" FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF "%PATH_LETTER%"=="%%G" IF EXIST "%%G:\" SET "PATH_SOURCE=%PATH_LETTER%:")
+IF "%SOURCE_TYPE%"=="PATH" FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF "%PATH_LETTER%"=="%%G" IF EXIST "%%G:\" SET "PATH_SOURCE=%PATH_LETTER%:"&&EXIT /B)
+IF "%SOURCE_TYPE%"=="PATH" IF DEFINED PATH_LETTER SET "INPUT=%PATH_LETTER%"&&SET "OUTPUT=PATH_SOURCE"&&CALL:SLASHER
 IF "%SOURCE_TYPE%"=="PATH" IF NOT DEFINED PATH_LETTER SET "PATH_SOURCE="
-IF "%SOURCE_TYPE%"=="WIM" SET "MENUT0=                           Image Processing"&&SET "MENUT1= "&&SET "MENUT2=  %#@%AVAILABLE WIMs:%#$%"&&SET "MENUT3= "&&SET "MENUT4= ( %##%.%#$% ) File Operation"&&SET "MENUB0= "&&SET "PICK=WIM"&&CALL:FILE_PICK
-IF "%SOURCE_TYPE%"=="VHDX" SET "MENUT0=                           Image Processing"&&SET "MENUT1= "&&SET "MENUT2=  %#@%AVAILABLE VHDXs:%#$%"&&SET "MENUT3= "&&SET "MENUT4= ( %##%.%#$% ) File Operation"&&SET "MENUB0= "&&SET "PICK=VHDX"&&CALL:FILE_PICK
-IF "%SOURCE_TYPE%"=="WIM" IF "%SELECT%"=="." SET "FILE_TYPE=WIM"&&CALL:BASIC_FILE&EXIT /B
-IF "%SOURCE_TYPE%"=="VHDX" IF "%SELECT%"=="." SET "FILE_TYPE=VHDX"&&CALL:BASIC_FILE&EXIT /B
+IF NOT "%SOURCE_TYPE%"=="PATH" SET "MENUT0=                           Image Processing"&&SET "MENUT1= "&&SET "MENUT2=  %#@%AVAILABLE %SOURCE_TYPE%s:%#$%"&&SET "MENUT3= "&&SET "MENUT4= ( %##%.%#$% ) File Operation"&&SET "MENUB0= "&&SET "PICK=%SOURCE_TYPE%"&&CALL:FILE_PICK
+IF NOT "%SOURCE_TYPE%"=="PATH" IF "%SELECT%"=="." SET "FILE_TYPE=%SOURCE_TYPE%"&&CALL:BASIC_FILE&EXIT /B
 IF NOT "%SOURCE_TYPE%"=="PATH" CALL SET "%SOURCE_TYPE%_SOURCE=%$TRUMP%"
 EXIT /B
 :IMAGEPROC_SLOT
@@ -2145,11 +2139,17 @@ ECHO.&&IF NOT DEFINED NO_PAUSE ECHO.&&CALL:BOXB1&&CALL:PAD_LINE&&CALL:PAUSED
 SET "NO_PAUSE="
 EXIT /B
 :FMGR_EXPLORE
-CLS&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                             Enter a path&&ECHO.&&ECHO.  %#@%AVAILABLE DRIVEs:%#$%&&ECHO.&&FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF EXIST "%%G:\" ECHO. %%G:\)
+CLS&&CALL:PAD_LINE&&CALL:BOXT1&&ECHO.                       Enter the PATH to explore&&ECHO.&&ECHO.  %#@%AVAILABLE PATHs:%#$%&&ECHO.&&FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF EXIST "%%G:\" ECHO. ^( %##%%%G%#$% ^) Volume %%G:)
 ECHO.&&CALL:BOXB1&&CALL:PAD_LINE&&CALL:PAD_PREV&&CALL:MENU_SELECT
-SET "SLASHER="&&IF DEFINED SELECT FOR /F "DELIMS=" %%G in ('CMD.EXE /D /U /C ECHO.%SELECT%^| FIND /V ""') do (SET "SLASHX=%%G"&&CALL:REMOVE_SLASH)
-IF NOT "%SLASHX%"=="\" IF EXIST "%SELECT%\" SET "FMGR_SOURCE=%SELECT%"
-IF "%SLASHX%"=="\" IF EXIST "%SELECT%" SET "FMGR_SOURCE=%SLASHZ%"
+IF DEFINED SELECT FOR %%G in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) DO (IF "%SELECT%"=="%%G" IF EXIST "%%G:\" SET "FMGR_SOURCE=%SELECT%:"&&EXIT /B)
+IF DEFINED SELECT SET "INPUT=%SELECT%"&&SET "OUTPUT=FMGR_SOURCE"&&CALL:SLASHER
+EXIT /B
+:SLASHER
+FOR /F "DELIMS=" %%G in ('CMD.EXE /D /U /C ECHO.%INPUT%^| FIND /V ""') do (SET "SLASHX=%%G"&&CALL:REMOVE_SLASH)
+IF NOT "%SLASHX%"=="\" IF EXIST "%INPUT%\" SET "%OUTPUT%=%INPUT%"
+IF "%SLASHX%"=="\" IF EXIST "%INPUT%" SET "%OUTPUT%=%SLASHZ%"
+IF NOT EXIST "%INPUT%\" SET "%OUTPUT%="
+SET "SLASHER="&&SET "OUTPUT="&&SET "INPUT="
 EXIT /B
 :REMOVE_SLASH
 SET "SLASHZ=%SLASHER%"&&SET "SLASHER=%SLASHER%%SLASHX%"