VSCodium/vscodium
1
1
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2024-11-23 08:27:38 +03:00
Code Issues Projects Releases Wiki Activity

fix: fail build when a patch can't be applied (#797)

Browse Source
This commit is contained in:
Baptiste Augrain 2021-08-14 22:59:32 +02:00 committed by GitHub
parent b1970e82af
commit b175fd43eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prepare_vscode.sh
View File

@ -11,7 +11,8 @@ cd vscode || exit
for file in ../patches/*.patch; do for file in ../patches/*.patch; do
if [ -f "$file" ]; then if [ -f "$file" ]; then
echo applying patch: $file; echo applying patch: $file;
if ! git apply --ignore-whitespace $file; then git apply --ignore-whitespace "$file"
if [ $? -ne 0 ]; then
echo failed to apply patch $file 1>&2 echo failed to apply patch $file 1>&2
fi fi
fi fi
@ -20,7 +21,8 @@ done
for file in ../patches/user/*.patch; do for file in ../patches/user/*.patch; do
if [ -f "$file" ]; then if [ -f "$file" ]; then
echo applying user patch: $file; echo applying user patch: $file;
if ! git apply --ignore-whitespace $file; then git apply --ignore-whitespace "$file"
if [ $? -ne 0 ]; then
echo failed to apply patch $file 1>&2 echo failed to apply patch $file 1>&2
fi fi
fi fi