ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'dev' into rc

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-03-08 17:04:28 +01:00
parent e1107ed165 ef93f6356c
commit bb26e9113c
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-update-git
+2
View File
@@ -4,5 +4,7 @@ set -e
echo -e "\e[32mUpdate Omarchy\e[0m" echo -e "\e[32mUpdate Omarchy\e[0m"
omarchy-update-time
git -C $OMARCHY_PATH pull --autostash git -C $OMARCHY_PATH pull --autostash
git -C $OMARCHY_PATH --no-pager diff --check || git -C $OMARCHY_PATH reset --merge git -C $OMARCHY_PATH --no-pager diff --check || git -C $OMARCHY_PATH reset --merge
bin/omarchy-update-perform
-1
View File
@@ -10,7 +10,6 @@ export CLICOLOR_FORCE=1
exec > >(tee "/tmp/omarchy-update.log") 2>&1 exec > >(tee "/tmp/omarchy-update.log") 2>&1
# Perform all update steps # Perform all update steps
omarchy-update-time
omarchy-update-keyring omarchy-update-keyring
omarchy-update-available-reset omarchy-update-available-reset
omarchy-update-system-pkgs omarchy-update-system-pkgs