Merge branch 'dev' into rc

This commit is contained in:
David Heinemeier Hansson
2026-03-08 17:04:28 +01:00
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ set -e
trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR
if [[ $1 == "-y" ]] || omarchy-update-confirm; then
omarchy-snapshot create || (( $? == 127 ))
omarchy-snapshot create || (($? == 127))
omarchy-update-git
omarchy-update-perform
fi
+2
View File
@@ -4,5 +4,7 @@ set -e
echo -e "\e[32mUpdate Omarchy\e[0m"
omarchy-update-time
git -C $OMARCHY_PATH pull --autostash
git -C $OMARCHY_PATH --no-pager diff --check || git -C $OMARCHY_PATH reset --merge
+2 -3
View File
@@ -3,14 +3,13 @@
set -e
# Ensure screensaver/sleep doesn't set in during updates
hyprctl dispatch tagwindow +noidle &> /dev/null || true
hyprctl dispatch tagwindow +noidle &>/dev/null || true
# Capture update logs (CLICOLOR_FORCE keeps gum styled when stdout is piped through tee)
export CLICOLOR_FORCE=1
exec > >(tee "/tmp/omarchy-update.log") 2>&1
# Perform all update steps
omarchy-update-time
omarchy-update-keyring
omarchy-update-available-reset
omarchy-update-system-pkgs
@@ -24,4 +23,4 @@ omarchy-update-analyze-logs
omarchy-update-restart
# Re-enable screensaver/sleep after updates
hyprctl dispatch tagwindow -- -noidle &> /dev/null || true
hyprctl dispatch tagwindow -- -noidle &>/dev/null || true