Baptiste Augrain 3 лет назад
Родитель
Сommit
8187c7fd7f
1 измененных файлов с 9 добавлено и 4 удалено
  1. 9 4
      prepare_vscode.sh

+ 9 - 4
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;