X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki_devel.git;a=blobdiff_plain;f=create_patch.sh;fp=create_patch.sh;h=082c6958f752ee4a49cf960b67baaeeeb004cce3;hp=c26d00708424c5af4961aeb7551a7eb634d51b44;hb=5302a8d398c00e8d47516b3d789039b0967ab31a;hpb=d58d490f43df2190aa75ff9c674290c9c3d46462 diff --git a/create_patch.sh b/create_patch.sh index c26d007..082c695 100755 --- 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/ + + 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 +