From 8187c7fd7f48d193b083c995cd0a608a829ec34c Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Thu, 29 Jul 2021 12:31:54 +0200 Subject: [PATCH] add a loop to apply patches (#779) --- prepare_vscode.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/prepare_vscode.sh b/prepare_vscode.sh index af44fe1..d3b35c8 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -8,10 +8,15 @@ cd vscode || exit ../update_settings.sh # apply patches -patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch -patch -u resources/linux/rpm/code.spec.template -i ../patches/fix-rpm-spec.patch -git apply --ignore-whitespace ../patches/binary-name.patch -git apply --ignore-whitespace ../patches/custom-gallery.patch +for file in ../patches/*.patch; do + if [ -f "$file" ]; then + echo applying patch: $file; + if ! git apply --ignore-whitespace $file; then + echo failed to apply patch $file 1>&2 + fi + fi +done + for file in ../patches/user/*.patch; do if [ -f "$file" ]; then echo applying user patch: $file;