diff options
| -rwxr-xr-x | support/scripts/apply-patches.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 968e2a406..e4b98bc05 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -40,8 +40,14 @@ function apply_patch { type="zip"; uncomp="unzip -d"; ;; *.Z) type="compress"; uncomp="uncompress -c"; ;; + *.diff*) + type="diff"; uncomp="cat"; ;; + *.patch*) + type="patch"; uncomp="cat"; ;; *) - type="plaintext"; uncomp="cat"; ;; + echo "Unsupported format file for ${patch}, skip it"; + return 0; + ;; esac echo "" echo "Applying $patch using ${type}: " @@ -67,12 +73,12 @@ function scan_patchdir { else for i in `cd $path; ls -d $patches 2> /dev/null` ; do if [ -d "${path}/$i" ] ; then - echo "${path}/$i skipped" + scan_patchdir "${path}/$i" elif echo "$i" | grep -q -E "\.tar(\..*)?$|\.tbz2?$|\.tgz$" ; then unpackedarchivedir="$builddir/.patches-$(basename $i)-unpacked" rm -rf "$unpackedarchivedir" 2> /dev/null mkdir "$unpackedarchivedir" - tar -C "$unpackedarchivedir" --strip-components=1 -xaf "${path}/$i" + tar -C "$unpackedarchivedir" -xaf "${path}/$i" scan_patchdir "$unpackedarchivedir" else apply_patch "$path" "$i" || exit 1 |