mirror of
https://github.com/VSCodium/vscodium
synced 2024-08-27 13:01:38 +00:00
fix: fail build when a patch can't be applied (#797)
This commit is contained in:
parent
b1970e82af
commit
b175fd43eb
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue