2023-07-20 18:25:13 +00:00
|
|
|
#!/usr/bin/env bash
|
2022-08-16 21:37:20 +00:00
|
|
|
|
2023-01-11 11:22:54 +00:00
|
|
|
if [[ "${1}" == *patch ]]; then
|
|
|
|
|
FILE="../patches/${1}"
|
|
|
|
|
else
|
|
|
|
|
FILE="../patches/${1}.patch"
|
|
|
|
|
fi
|
2022-08-16 21:37:20 +00:00
|
|
|
|
|
|
|
|
cd vscode || { echo "'vscode' dir not found"; exit 1; }
|
|
|
|
|
|
2022-09-25 12:54:41 +00:00
|
|
|
git add .
|
|
|
|
|
git reset -q --hard HEAD
|
|
|
|
|
|
2022-09-30 06:44:14 +00:00
|
|
|
if [[ -f "${FILE}" ]]; then
|
2022-09-27 18:14:27 +00:00
|
|
|
git apply --reject "${FILE}"
|
|
|
|
|
fi
|
2022-08-16 21:37:20 +00:00
|
|
|
|
2023-01-31 13:33:29 +00:00
|
|
|
git apply --reject "../patches/helper/settings.patch"
|
|
|
|
|
|
2023-07-20 18:25:13 +00:00
|
|
|
read -rp "Press any key when the conflict have been resolved..." -n1 -s
|
2022-08-16 21:37:20 +00:00
|
|
|
|
2023-01-31 13:33:29 +00:00
|
|
|
git restore .vscode/settings.json
|
|
|
|
|
|
2022-11-01 17:56:12 +00:00
|
|
|
git add .
|
|
|
|
|
git diff --staged -U1 > "${FILE}"
|
2022-08-16 21:37:20 +00:00
|
|
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
echo "The patch has been generated."
|
