Don't replace product.json in RPM updates

alexhass · Nov 15, 2020 · 2d58d3b · 2d58d3b
1 parent bfb4be2
commit 2d58d3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/patches/no-replace-product-json.patch b/patches/no-replace-product-json.patch
@@ -0,0 +1,8 @@
+--- vscode/resources/linux/rpm/code.spec.template	2020-11-15 15:28:20.179070106 +0800
++++ vscode/resources/linux/rpm/code.spec.template.new	2020-11-15 15:25:39.269000000 +0800
+@@ -69,3 +69,5 @@
+ /usr/share/pixmaps/@@ICON@@.png
+ /usr/share/bash-completion/completions/@@NAME@@
+ /usr/share/zsh/site-functions/_@@NAME@@
++
++%config(noreplace) /usr/share/@@NAME@@/resources/app/product.json
diff --git a/prepare_vscode.sh b/prepare_vscode.sh
@@ -14,6 +14,7 @@ cd vscode || exit
 
 # 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/no-replace-product-json.patch
 
 if [[ "$OS_NAME" == "osx" ]]; then
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional