diff --git a/win32/rm.bat b/win32/rm.bat index 8dddf454d6..7f0336c202 100755 --- a/win32/rm.bat +++ b/win32/rm.bat @@ -1,18 +1,15 @@ @echo off +setlocal +set recursive= :optloop if "%1" == "-f" shift if "%1" == "-r" (shift & set "recursive=1" & goto :optloop) -if "%recursive%" == "1" goto :recursive :begin if "%1" == "" goto :end set p=%1 -if exist "%p:/=\%" for %%I in ("%p:/=\%") do @del "%%I" +if exist "%p:/=\%" for %%I in ("%p:/=\%") do ( + del /q "%%I" || if "%recursive%" == "1" rd /s /q "%%I" +) 2> nul shift goto :begin -:recursive -if "%1" == "" goto :end -set p=%1 -if exist "%p:/=\%" rd /s /q "%p:/=\%" -shift -goto :recursive :end