Make patching more resilient

This commit is contained in:
David Heinemeier Hansson
2026-01-06 13:09:51 +01:00
parent 0d42f1bafe
commit ebc8a9ef62

View File

@@ -1,6 +1,8 @@
echo "Add voxtype to waybar"
patch -N ~/.config/waybar/style.css << 'EOF'
failed=0
if ! patch -N ~/.config/waybar/style.css << 'EOF'
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -74,10 +74,16 @@ tooltip {
@@ -22,8 +24,11 @@ patch -N ~/.config/waybar/style.css << 'EOF'
+ margin: 0 0 0 7.5px;
+}
EOF
then
failed=1
fi
patch -N ~/.config/waybar/config.jsonc << 'EOF'
if ! patch -N ~/.config/waybar/config.jsonc << 'EOF'
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -5,7 +5,7 @@
@@ -56,5 +61,17 @@ patch -N ~/.config/waybar/config.jsonc << 'EOF'
"icon-size": 12,
"spacing": 17
EOF
then
failed=1
fi
omarchy-restart-waybar
if [ $failed -eq 1 ]; then
echo -e "\033[31mUnable to update Waybar config automatically.\033[0m"
echo
if gum confirm "Reset waybar config to default to get Voxtype dictation integration?"; then
omarchy-refresh-waybar
fi
else
omarchy-restart-waybar
fi