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=c26d00708424c5af4961aeb7551a7eb634d51b44;hp=63fa429ec2f47929e8cb627157f97e5108bb7ff2;hb=76ecae9a8addc7187d2577e1e390624676ba3b80;hpb=632055f4aef00f0124e430ac3c797a9fc56f3bce diff --git a/create_patch.sh b/create_patch.sh index 63fa429..c26d007 100755 --- a/create_patch.sh +++ b/create_patch.sh @@ -15,9 +15,9 @@ done no_exit_diff() { - set +e + set +e diff $@ - set -e + set -e } # Create patch packages @@ -32,3 +32,20 @@ zip update_pukiwiki_${P2N}_eucjp.patch.zip update_pukiwiki_${P2N}_eucjp.patch cp -p update_pukiwiki_${P2N}_utf8.patch.zip update_pukiwiki_${P2N}${SUFFIX}-${REV4}_utf8.patch.zip cp -p update_pukiwiki_${P2N}_eucjp.patch.zip update_pukiwiki_${P2N}${SUFFIX}-${REV4}_eucjp.patch.zip +# Compare +cp -rp pukiwiki-${PREV}_utf8/ _upgrade_pukiwiki-${PREV}_utf8/ +cp -rp pukiwiki-${PREV}_eucjp/ _upgrade_pukiwiki-${PREV}_eucjp/ + +pushd _upgrade_pukiwiki-${PREV}_utf8/ + patch -p1 < ../update_pukiwiki_${P2N}_utf8.patch +popd + +pushd _upgrade_pukiwiki-${PREV}_eucjp/ + patch -p1 < ../update_pukiwiki_${P2N}_eucjp.patch +popd + +set +e + diff -ur pukiwiki-${NEW}_utf8/ _upgrade_pukiwiki-${PREV}_utf8/ + diff -ur pukiwiki-${NEW}_eucjp/ _upgrade_pukiwiki-${PREV}_eucjp/ +set -e +