1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix --empty option of ifchange

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-11-24 18:25:46 +09:00
parent 3826019f31
commit c6ca339955
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2024-11-24 10:07:56 +00:00 
Merged: https://github.com/ruby/ruby/pull/12159
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tool/ifchange
View File

@ -18,7 +18,7 @@ HELP
set -e set -e
timestamp= timestamp=
keepsuffix= keepsuffix=
empty= srcavail=f
color=auto color=auto
until [ $# -eq 0 ]; do until [ $# -eq 0 ]; do
case "$1" in case "$1" in
@ -39,7 +39,7 @@ until [ $# -eq 0 ]; do
keepsuffix=`expr \( "$1" : '[^=]*=\(.*\)' \)` keepsuffix=`expr \( "$1" : '[^=]*=\(.*\)' \)`
;; ;;
--empty) --empty)
empty=yes srcavail=s
;; ;;
--color) --color)
color=always color=always
@ -97,7 +97,7 @@ fi
targetdir= targetdir=
case "$target" in */*) targetdir=`dirname "$target"`;; esac case "$target" in */*) targetdir=`dirname "$target"`;; esac
if [ -f "$target" -a ! -${empty:+f}${empty:-s} "$temp" ] || cmp "$target" "$temp" >/dev/null 2>&1; then if [ -f "$target" -a ! -${srcavail} "$temp" ] || cmp "$target" "$temp" >/dev/null 2>&1; then
echo "$target ${msg_unchanged}unchanged${msg_reset}" echo "$target ${msg_unchanged}unchanged${msg_reset}"
rm -f "$temp" rm -f "$temp"
else else

2
win32/ifchange.bat
View File

@ -62,7 +62,7 @@ set src=%src:/=\%
if exist %dest% ( if exist %dest% (
if not exist %src% goto :nt_unchanged1 if not exist %src% goto :nt_unchanged1
if "%empty%" == "" for %%I in (%src%) do if %%~zI == 0 goto :nt_unchanged if not "%empty%" == "" for %%I in (%src%) do if %%~zI == 0 goto :nt_unchanged
fc.exe %dest% %src% > nul && ( fc.exe %dest% %src% > nul && (
:nt_unchanged :nt_unchanged
del %src% del %src%