OSDN Git Service
(root)
/
pukiwiki
/
pukiwiki_devel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d58d490
)
Stop build process when verifying patch fails
master
author
umorigu
<umorigu@gmail.com>
Wed, 24 Nov 2021 12:03:18 +0000
(21:03 +0900)
committer
umorigu
<umorigu@gmail.com>
Wed, 24 Nov 2021 12:03:18 +0000
(21:03 +0900)
create_patch.sh
patch
|
blob
|
history
diff --git
a/create_patch.sh
b/create_patch.sh
index
c26d007
..
082c695
100755
(executable)
--- a/
create_patch.sh
+++ b/
create_patch.sh
@@
-47,5
+47,18
@@
popd
set +e
diff -ur pukiwiki-${NEW}_utf8/ _upgrade_pukiwiki-${PREV}_utf8/
diff -ur pukiwiki-${NEW}_eucjp/ _upgrade_pukiwiki-${PREV}_eucjp/
set +e
diff -ur pukiwiki-${NEW}_utf8/ _upgrade_pukiwiki-${PREV}_utf8/
diff -ur pukiwiki-${NEW}_eucjp/ _upgrade_pukiwiki-${PREV}_eucjp/
+
+ DIFF_U=$(diff -ur pukiwiki-${NEW}_utf8/ _upgrade_pukiwiki-${PREV}_utf8/ | grep -v 'zip differ')
+ DIFF_E=$(diff -ur pukiwiki-${NEW}_eucjp/ _upgrade_pukiwiki-${PREV}_eucjp/ | grep -v 'zip differ')
set -e
set -e
+if [ -n "$DIFF_U" ]; then
+ echo "Invalid patch (UTF-8)"
+ exit 101
+fi
+
+if [ -n "$DIFF_E" ]; then
+ echo "Invalid patch (EUC-JP)"
+ exit 102
+fi
+