timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-19 13:46:03 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into insider

Browse Source
This commit is contained in:
Baptiste Augrain
2023-08-04 11:03:00 +02:00
parent b9cfdf370d 1e41cef8a6
commit 63dc9d739b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
prepare_vscode.sh
View File

@@ -26,6 +26,7 @@ for file in ../patches/*.patch; do
echo applying patch: "${file}"; echo applying patch: "${file}";
if ! git apply --ignore-whitespace "${file}"; then if ! git apply --ignore-whitespace "${file}"; then
echo failed to apply patch "${file}" >&2 echo failed to apply patch "${file}" >&2
exit 1
fi fi
fi fi
done done
@@ -36,6 +37,7 @@ if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
echo applying patch: "${file}"; echo applying patch: "${file}";
if ! git apply --ignore-whitespace "${file}"; then if ! git apply --ignore-whitespace "${file}"; then
echo failed to apply patch "${file}" >&2 echo failed to apply patch "${file}" >&2
exit 1
fi fi
fi fi
done done
@@ -46,6 +48,7 @@ for file in ../patches/user/*.patch; do
echo applying user patch: "${file}"; echo applying user patch: "${file}";
if ! git apply --ignore-whitespace "${file}"; then if ! git apply --ignore-whitespace "${file}"; then
echo failed to apply patch "${file}" >&2 echo failed to apply patch "${file}" >&2
exit 1
fi fi
fi fi
done done