Remove old test repo
This commit is contained in:
@@ -352,47 +352,28 @@ 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"
|
||||||
|
|
||||||
# Drop any stale [omarchy-dev] block every time. Re-add it only for dev
|
# Replace the normal Omarchy package repository. Dev package mode uses the
|
||||||
# package mode so normal upgrades resolve release packages from [omarchy].
|
# edge channel and resolves omarchy-dev / omarchy-settings-dev from [omarchy].
|
||||||
local dev_server='https://share.heyoodle.com/omarchy/dev/$arch'
|
|
||||||
local tmp
|
local tmp
|
||||||
|
|
||||||
tmp=$(mktemp)
|
tmp=$(mktemp)
|
||||||
awk -v server="$package_server" -v dev_server="$dev_server" -v use_dev="$use_dev_packages" '
|
awk -v server="$package_server" '
|
||||||
BEGIN { in_omarchy = 0; in_dev = 0; wrote = 0; use_dev += 0 }
|
BEGIN { in_omarchy = 0; wrote = 0 }
|
||||||
/^\[omarchy-dev\]$/ {
|
/^[[:space:]]*\[omarchy\][[:space:]]*$/ {
|
||||||
in_dev = 1
|
|
||||||
in_omarchy = 0
|
|
||||||
next
|
|
||||||
}
|
|
||||||
/^\[omarchy\]$/ {
|
|
||||||
if (!wrote) {
|
if (!wrote) {
|
||||||
if (use_dev) {
|
|
||||||
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 = 0; in_dev = 0 }
|
/^[[:space:]]*\[/ { in_omarchy = 0 }
|
||||||
!in_omarchy && !in_dev { print }
|
!in_omarchy { print }
|
||||||
END {
|
END {
|
||||||
if (!wrote) {
|
if (!wrote) {
|
||||||
print ""
|
print ""
|
||||||
if (use_dev) {
|
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user