diff --git a/bin/omarchy-channel-current b/bin/omarchy-channel-current index f6f57f71..cc35e13c 100755 --- a/bin/omarchy-channel-current +++ b/bin/omarchy-channel-current @@ -12,9 +12,10 @@ if [[ $OMARCHY_PATH != "/usr/share/omarchy" ]]; then exit 0 fi -# omarchy-dev / omarchy-settings-dev are only shipped from the edge mirror, so -# their presence alone means edge. omarchy / omarchy-settings come from either -# the stable or rc mirror, distinguished by omarchy-version-channel. +# omarchy-dev / omarchy-settings-dev are only shipped from the edge package +# repo, so their presence alone means edge. omarchy / omarchy-settings come +# from either the stable or rc mirror, distinguished by omarchy-version-channel +# (which reports the mirror as its first token). if pacman -Q omarchy-dev omarchy-settings-dev >/dev/null 2>&1; then echo edge elif pacman -Q omarchy omarchy-settings >/dev/null 2>&1; then diff --git a/bin/omarchy-upgrade-to-quattro b/bin/omarchy-upgrade-to-quattro index 8c5e1893..bdaa8d85 100755 --- a/bin/omarchy-upgrade-to-quattro +++ b/bin/omarchy-upgrade-to-quattro @@ -281,7 +281,7 @@ case "$channel" in ;; rc) mirror_server='https://rc-mirror.omarchy.org/$repo/os/$arch' - package_server='https://pkgs.omarchy.org/rc/$arch' + package_server='https://pkgs.omarchy.org/edge/$arch' ;; edge) mirror_server='https://mirror.omarchy.org/$repo/os/$arch' diff --git a/bin/omarchy-version-channel b/bin/omarchy-version-channel index 8a646cec..3ed4cbc3 100755 --- a/bin/omarchy-version-channel +++ b/bin/omarchy-version-channel @@ -16,8 +16,6 @@ if grep -q "https://pkgs.omarchy.org/stable/" /etc/pacman.conf; then pkgs="stable" elif grep -q "https://pkgs.omarchy.org/edge/" /etc/pacman.conf; then pkgs="edge" -elif grep -q "https://pkgs.omarchy.org/rc/" /etc/pacman.conf; then - pkgs="rc" else pkgs="unknown" fi