Skip to content

Commit c6ca339

Browse files
committed
Fix --empty option of ifchange
1 parent 3826019 commit c6ca339

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

tool/ifchange

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ HELP
1818
set -e
1919
timestamp=
2020
keepsuffix=
21-
empty=
21+
srcavail=f
2222
color=auto
2323
until [ $# -eq 0 ]; do
2424
case "$1" in
@@ -39,7 +39,7 @@ until [ $# -eq 0 ]; do
3939
keepsuffix=`expr \( "$1" : '[^=]*=\(.*\)' \)`
4040
;;
4141
--empty)
42-
empty=yes
42+
srcavail=s
4343
;;
4444
--color)
4545
color=always
@@ -97,7 +97,7 @@ fi
9797

9898
targetdir=
9999
case "$target" in */*) targetdir=`dirname "$target"`;; esac
100-
if [ -f "$target" -a ! -${empty:+f}${empty:-s} "$temp" ] || cmp "$target" "$temp" >/dev/null 2>&1; then
100+
if [ -f "$target" -a ! -${srcavail} "$temp" ] || cmp "$target" "$temp" >/dev/null 2>&1; then
101101
echo "$target ${msg_unchanged}unchanged${msg_reset}"
102102
rm -f "$temp"
103103
else

win32/ifchange.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ set src=%src:/=\%
6262

6363
if exist %dest% (
6464
if not exist %src% goto :nt_unchanged1
65-
if "%empty%" == "" for %%I in (%src%) do if %%~zI == 0 goto :nt_unchanged
65+
if not "%empty%" == "" for %%I in (%src%) do if %%~zI == 0 goto :nt_unchanged
6666
fc.exe %dest% %src% > nul && (
6767
:nt_unchanged
6868
del %src%

0 commit comments

Comments
 (0)