OSDN Git Service

Stop build process when verifying patch fails master
authorumorigu <umorigu@gmail.com>
Wed, 24 Nov 2021 12:03:18 +0000 (21:03 +0900)
committerumorigu <umorigu@gmail.com>
Wed, 24 Nov 2021 12:03:18 +0000 (21:03 +0900)
create_patch.sh

index c26d007..082c695 100755 (executable)
@@ -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/
+
+  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
 
+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
+