From f6cd5e076dd96c28418cac2d97e354a59aee67b4 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 22 Nov 2025 10:41:30 +0100 Subject: [PATCH] Simplify switching between edge and stable channels --- bin/omarchy-refresh-pacman | 14 +++++++++++++- bin/omarchy-refresh-pacman-mirrorlist | 7 ------- bin/omarchy-refresh-pacman-opr-server | 7 ------- migrations/1756411333.sh | 2 +- migrations/1762770815.sh | 3 +-- 5 files changed, 15 insertions(+), 18 deletions(-) delete mode 100755 bin/omarchy-refresh-pacman-mirrorlist delete mode 100755 bin/omarchy-refresh-pacman-opr-server diff --git a/bin/omarchy-refresh-pacman b/bin/omarchy-refresh-pacman index f24f9398..1d20cae3 100755 --- a/bin/omarchy-refresh-pacman +++ b/bin/omarchy-refresh-pacman @@ -1,4 +1,16 @@ #!/bin/bash sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf -omarchy-refresh-pacman-mirrorlist + +if [[ $1 == "edge" ]]; then + sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist + sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf + echo "Setting mirror and pkgs channel to edge" +else + sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist + sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf + echo "Setting mirror and pkgs channel to stable" +fi + +echo +sudo pacman -Syu --noconfirm diff --git a/bin/omarchy-refresh-pacman-mirrorlist b/bin/omarchy-refresh-pacman-mirrorlist deleted file mode 100755 index abaf9b1e..00000000 --- a/bin/omarchy-refresh-pacman-mirrorlist +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [[ $1 == "edge" ]]; then - sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist -else - sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist -fi diff --git a/bin/omarchy-refresh-pacman-opr-server b/bin/omarchy-refresh-pacman-opr-server deleted file mode 100755 index 601e6b92..00000000 --- a/bin/omarchy-refresh-pacman-opr-server +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [[ $1 == "edge" ]]; then - sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf -else - sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf -fi diff --git a/migrations/1756411333.sh b/migrations/1756411333.sh index c44e9ce1..5312a6f5 100644 --- a/migrations/1756411333.sh +++ b/migrations/1756411333.sh @@ -1,3 +1,3 @@ echo "Use new Omarchy mirror as default" -omarchy-refresh-pacman-mirrorlist +omarchy-refresh-pacman diff --git a/migrations/1762770815.sh b/migrations/1762770815.sh index 9c16f7b0..36e6a4b4 100644 --- a/migrations/1762770815.sh +++ b/migrations/1762770815.sh @@ -1,4 +1,3 @@ echo "Pull packages from stable Arch mirror" -omarchy-refresh-pacman-mirrorlist stable -sudo pacman -Syu +omarchy-refresh-pacman