From 0d548b73efb31452465dab5d15238e336125042c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 30 Dec 2017 14:15:51 +0100 Subject: [PATCH] scripts/vim-patch.sh: continue when patching with -P fails (#7790) The `set -e` caused the script to stop in case `patch` fails, but it is better to continue giving instructions. --- scripts/vim-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index c6ff280bb5..ac5e326e9d 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -234,7 +234,7 @@ stage_patch() { printf "\n✘ 'patch' command not found\n" else printf "\nApplying patch...\n" - patch -p1 --posix < "${patch_file}" + patch -p1 --posix < "${patch_file}" || true fi printf "\nInstructions:\n Proceed to port the patch.\n" else