upgrade-to-4: inject [omarchy-dev] above [omarchy] in pacman.conf
TEMPORARY: while the omarchy-4 stack is being iterated, the production edge/stable/rc channels at pkgs.omarchy.org/<ring>/x86_64 don't have the new omarchy and omarchy-settings packages — only omarchy-keyring and omarchy-nvim are published. The work-in-progress packages live in the dev repo at share.heyoodle.com/omarchy/dev/<arch> via omarchy-pkgs/bin/publish-dev-repo. To stop hand-editing pacman.conf after every run of this script, configure_pacman_channel() now emits a [omarchy-dev] block right above [omarchy] with SigLevel = Never and the share.heyoodle URL. Pacman honors repo declaration order, so dev packages take precedence when both ring publish them. The awk also dedupes any pre-existing [omarchy-dev] block (so rerunning the script doesn't pile up duplicate entries) and falls back to appending both blocks at the end if no [omarchy] section was present. Revert this block once the production rings have caught up.
This commit is contained in:
@@ -348,23 +348,44 @@ configure_pacman_channel() {
|
|||||||
|
|
||||||
as_root cp -f /etc/pacman.conf "/etc/pacman.conf.omarchy-upgrade-to-4.$backup_suffix.bak"
|
as_root cp -f /etc/pacman.conf "/etc/pacman.conf.omarchy-upgrade-to-4.$backup_suffix.bak"
|
||||||
|
|
||||||
|
# TEMPORARY: also inject [omarchy-dev] above [omarchy] so dev-built
|
||||||
|
# packages from share.heyoodle.com (see omarchy-pkgs/bin/publish-dev-repo)
|
||||||
|
# take precedence while the omarchy-4 stack is being iterated on. Revert
|
||||||
|
# this block once the production edge/stable/rc channels have caught up.
|
||||||
|
local dev_server='https://share.heyoodle.com/omarchy/dev/$arch'
|
||||||
|
|
||||||
tmp=$(mktemp)
|
tmp=$(mktemp)
|
||||||
awk -v server="$package_server" '
|
awk -v server="$package_server" -v dev_server="$dev_server" '
|
||||||
BEGIN { in_omarchy = 0; wrote = 0 }
|
BEGIN { in_omarchy = 0; in_dev = 0; wrote = 0 }
|
||||||
|
/^\[omarchy-dev\]$/ {
|
||||||
|
# Drop any existing [omarchy-dev] block; we re-emit it next to [omarchy].
|
||||||
|
in_dev = 1
|
||||||
|
in_omarchy = 0
|
||||||
|
next
|
||||||
|
}
|
||||||
/^\[omarchy\]$/ {
|
/^\[omarchy\]$/ {
|
||||||
if (!wrote) {
|
if (!wrote) {
|
||||||
|
print "[omarchy-dev]"
|
||||||
|
print "SigLevel = Never"
|
||||||
|
print "Server = " dev_server
|
||||||
|
print ""
|
||||||
print "[omarchy]"
|
print "[omarchy]"
|
||||||
print "SigLevel = Optional TrustAll"
|
print "SigLevel = Optional TrustAll"
|
||||||
print "Server = " server
|
print "Server = " server
|
||||||
wrote = 1
|
wrote = 1
|
||||||
}
|
}
|
||||||
in_omarchy = 1
|
in_omarchy = 1
|
||||||
|
in_dev = 0
|
||||||
next
|
next
|
||||||
}
|
}
|
||||||
/^\[/ && in_omarchy { in_omarchy = 0 }
|
/^\[/ { in_omarchy = 0; in_dev = 0 }
|
||||||
!in_omarchy { print }
|
!in_omarchy && !in_dev { print }
|
||||||
END {
|
END {
|
||||||
if (!wrote) {
|
if (!wrote) {
|
||||||
|
print ""
|
||||||
|
print "[omarchy-dev]"
|
||||||
|
print "SigLevel = Never"
|
||||||
|
print "Server = " dev_server
|
||||||
print ""
|
print ""
|
||||||
print "[omarchy]"
|
print "[omarchy]"
|
||||||
print "SigLevel = Optional TrustAll"
|
print "SigLevel = Optional TrustAll"
|
||||||
|
|||||||
Reference in New Issue
Block a user