2022-06-20 04:34:50 -04:00
|
|
|
#!/bin/bash
|
|
|
|
|
|
|
|
cd vscode || { echo "'vscode' dir not found"; exit 1; }
|
|
|
|
|
|
|
|
git add .
|
|
|
|
git reset -q --hard HEAD
|
|
|
|
|
|
|
|
for file in ../patches/*.patch; do
|
|
|
|
if [ -f "${file}" ]; then
|
|
|
|
echo applying patch: "${file}"
|
|
|
|
git apply --ignore-whitespace "${file}"
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
echo failed to apply patch "${file}"
|
|
|
|
git apply --reject "${file}"
|
|
|
|
read -p "Press any key when the conflict have been resolved..." -n1 -s
|
2022-08-17 01:36:15 -04:00
|
|
|
git diff -U1 > "${file}"
|
2022-06-20 04:34:50 -04:00
|
|
|
fi
|
|
|
|
git add .
|
|
|
|
git reset -q --hard HEAD
|
|
|
|
fi
|
|
|
|
done
|