Merge branch 'dev' into rc
This commit is contained in:
+1
-1
@@ -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
|
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
|
if [[ $1 == "-y" ]] || omarchy-update-confirm; then
|
||||||
omarchy-snapshot create || (( $? == 127 ))
|
omarchy-snapshot create || (($? == 127))
|
||||||
omarchy-update-git
|
omarchy-update-git
|
||||||
omarchy-update-perform
|
omarchy-update-perform
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -3,14 +3,13 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Ensure screensaver/sleep doesn't set in during updates
|
# 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)
|
# Capture update logs (CLICOLOR_FORCE keeps gum styled when stdout is piped through tee)
|
||||||
export CLICOLOR_FORCE=1
|
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
|
||||||
@@ -24,4 +23,4 @@ omarchy-update-analyze-logs
|
|||||||
omarchy-update-restart
|
omarchy-update-restart
|
||||||
|
|
||||||
# Re-enable screensaver/sleep after updates
|
# Re-enable screensaver/sleep after updates
|
||||||
hyprctl dispatch tagwindow -- -noidle &> /dev/null || true
|
hyprctl dispatch tagwindow -- -noidle &>/dev/null || true
|
||||||
|
|||||||
Reference in New Issue
Block a user