timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-24 11:50:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: update to 1.76 (#1432)

Browse Source
This commit is contained in:
Baptiste Augrain
2023-03-02 23:23:03 +01:00
committed by GitHub
parent 69261e134e
commit 41b949f19e
4 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/update_patches.sh
View File

@@ -21,8 +21,13 @@ for FILE in ../patches/*.patch; do
git apply --ignore-whitespace "${FILE}"
if [ $? -ne 0 ]; then
echo failed to apply patch "${FILE}"
git apply --reject "${FILE}"
git apply --reject "../patches/helper/settings.patch"
read -p "Press any key when the conflict have been resolved..." -n1 -s
git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"
fi
@@ -38,8 +43,13 @@ if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
git apply --ignore-whitespace "${FILE}"
if [ $? -ne 0 ]; then
echo failed to apply patch "${FILE}"
git apply --reject "${FILE}"
git apply --reject "../patches/helper/settings.patch"
read -p "Press any key when the conflict have been resolved..." -n1 -s
git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"
fi