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

Keep rc on its own mirror but use the edge package repo

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-06-29 11:28:32 -05:00
parent 987588f512
commit e49c74eee8
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-channel-current
+4 -3
View File
@@ -12,9 +12,10 @@ if [[ $OMARCHY_PATH != "/usr/share/omarchy" ]]; then
exit 0 exit 0
fi fi
# omarchy-dev / omarchy-settings-dev are only shipped from the edge mirror, so # omarchy-dev / omarchy-settings-dev are only shipped from the edge package
# their presence alone means edge. omarchy / omarchy-settings come from either # repo, so their presence alone means edge. omarchy / omarchy-settings come
# the stable or rc mirror, distinguished by omarchy-version-channel. # 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 if pacman -Q omarchy-dev omarchy-settings-dev >/dev/null 2>&1; then
echo edge echo edge
elif pacman -Q omarchy omarchy-settings >/dev/null 2>&1; then elif pacman -Q omarchy omarchy-settings >/dev/null 2>&1; then
bin/omarchy-upgrade-to-quattro
+1 -1
View File
@@ -281,7 +281,7 @@ case "$channel" in
;; ;;
rc) rc)
mirror_server='https://rc-mirror.omarchy.org/$repo/os/$arch' 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) edge)
mirror_server='https://mirror.omarchy.org/$repo/os/$arch' mirror_server='https://mirror.omarchy.org/$repo/os/$arch'
bin/omarchy-version-channel
-2
View File
@@ -16,8 +16,6 @@ if grep -q "https://pkgs.omarchy.org/stable/" /etc/pacman.conf; then
pkgs="stable" pkgs="stable"
elif grep -q "https://pkgs.omarchy.org/edge/" /etc/pacman.conf; then elif grep -q "https://pkgs.omarchy.org/edge/" /etc/pacman.conf; then
pkgs="edge" pkgs="edge"
elif grep -q "https://pkgs.omarchy.org/rc/" /etc/pacman.conf; then
pkgs="rc"
else else
pkgs="unknown" pkgs="unknown"
fi fi