find-tools.batの環境変数クリア機能を関数化して内部から呼べるようにする

sakura-editor · Jan 10, 2022 · 3485c28 · 3485c28
1 parent afaf9e5
commit 3485c28
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/tools/find-tools.bat b/tools/find-tools.bat
@@ -2,20 +2,7 @@
 setlocal
 
 if "%1" equ "clear" (
-    endlocal
-    set CMD_GIT=
-    set CMD_7Z=
-    set CMD_HHC=
-    set CMD_ISCC=
-    set CMD_VSWHERE=
-    set CMD_MSBUILD=
-    set CMD_CMAKE=
-    set CMD_NINJA=
-    set CMD_LEPROC=
-    set CMD_PYTHON=
-    set NUM_VSVERSION=
-    set CMAKE_G_PARAM=
-    set FIND_TOOLS_CALLED=
+    call :clear_variables
     echo find-tools.bat has been cleared
     exit /b
 ) else if "%~1" neq "" (
@@ -66,6 +53,23 @@ endlocal ^
 set FIND_TOOLS_CALLED=1
 exit /b
 
+:clear_variables
+    endlocal
+    set CMD_GIT=
+    set CMD_7Z=
+    set CMD_HHC=
+    set CMD_ISCC=
+    set CMD_VSWHERE=
+    set CMD_MSBUILD=
+    set CMD_CMAKE=
+    set CMD_NINJA=
+    set CMD_LEPROC=
+    set CMD_PYTHON=
+    set NUM_VSVERSION=
+    set CMAKE_G_PARAM=
+    set FIND_TOOLS_CALLED=
+    exit /b
+
 :Git
 set APPDIR=Git\Cmd
 set PATH2=%PATH%;%ProgramFiles%\%APPDIR%\;%ProgramFiles(x86)%\%APPDIR%\;%ProgramW6432%\%APPDIR%\;