Compare commits

...

1 Commits

Author SHA1 Message Date
Baptiste Augrain
b175fd43eb fix: fail build when a patch can't be applied (#797) 2021-08-14 22:59:32 +02:00

View File

@@ -11,7 +11,8 @@ cd vscode || exit
for file in ../patches/*.patch; do
if [ -f "$file" ]; then
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
fi
fi
@@ -20,7 +21,8 @@ done
for file in ../patches/user/*.patch; do
if [ -f "$file" ]; then
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
fi
fi