Skip to content
This repository was archived by the owner on Apr 22, 2020. It is now read-only.

Commit e9f2985

Browse files
fixed bug: release commit script undoing add because when there are no files matching an extension, the sync function ends up treating *.ext as a file and svn deleting that after the svn add.
1 parent 6891aad commit e9f2985

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

cut-release.sh

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,22 +132,24 @@ function sync() {
132132
local ext
133133
local src_file
134134
local dest_file
135-
for ext in $exts; do
136-
for src_file in "$src_dir"/*."$ext"; do
137-
if [ "$src_file" == "$src_dir/\*.$ext" ]; then continue; fi
138-
dest_file="$dest_dir"/"$(basename "$src_file")"
139-
if ! [ -e "$dest_file" ] || diff -q "$src_file" "$dest_file"; then
140-
"$action" "$src_file" "$dest_file"
141-
fi
135+
(
136+
shopt -s nullglob
137+
for ext in $exts; do
138+
for src_file in "$src_dir"/*."$ext"; do
139+
dest_file="$dest_dir"/"$(basename "$src_file")"
140+
if ! [ -e "$dest_file" ] || \
141+
diff -q "$src_file" "$dest_file"; then
142+
"$action" "$src_file" "$dest_file"
143+
fi
144+
done
145+
for dest_file in "$dest_dir"/*."$ext"; do
146+
src_file="$src_dir"/"$(basename "$dest_file")"
147+
if ! [ -e "$src_file" ]; then
148+
"$action" "$src_file" "$dest_file"
149+
fi
150+
done
142151
done
143-
for dest_file in "$dest_dir"/*."$ext"; do
144-
if [ "$dest_file" == "$dest_dir/\*.$ext" ]; then continue; fi
145-
src_file="$src_dir"/"$(basename "$dest_file")"
146-
if ! [ -e "$src_file" ]; then
147-
"$action" "$src_file" "$dest_file"
148-
fi
149-
done
150-
done
152+
)
151153
}
152154

153155
function svn_sync() {

0 commit comments

Comments
 (0)