ruby-changes:58910
From: NAKAMURA <ko1@a...>
Date: Tue, 26 Nov 2019 11:46:26 +0900 (JST)
Subject: [ruby-changes:58910] 7bd7a013b1 (master): Fix `$(RMALL) -r` on Windows
https://git.ruby-lang.org/ruby.git/commit/?id=7bd7a013b1 From 7bd7a013b14fb6c4403ff243ec5db13c5c71f552 Mon Sep 17 00:00:00 2001 From: NAKAMURA Usaku <usa@r...> Date: Tue, 26 Nov 2019 11:44:11 +0900 Subject: Fix `$(RMALL) -r` on Windows `set recursive=1 &` sets `1 ` to `recursive`, not `1`. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e273260..6594648 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -90,7 +90,7 @@ IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L90 RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat RMDIR = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat -RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -r +RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -f -r MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat CP = copy > nul MV = move > nul diff --git a/win32/rm.bat b/win32/rm.bat index 9496441..8dddf45 100755 --- a/win32/rm.bat +++ b/win32/rm.bat @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/win32/rm.bat#L1 @echo off :optloop if "%1" == "-f" shift -if "%1" == "-r" (shift & set recursive=1 & goto :optloop) +if "%1" == "-r" (shift & set "recursive=1" & goto :optloop) if "%recursive%" == "1" goto :recursive :begin if "%1" == "" goto :end -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/