Merge cn-region-switch (with omarchy #13690)
# Conflicts: # AGENTS.md # bin/omarchy-refresh-pacman # default/omarchy/omarchy-menu.jsonc # install/post-install/pacman.sh # shell/plugins/menu/MenuModel.js # test/shell.d/menu-test.sh
This commit is contained in:
35 files changed
+918
-7
No files matched your search
@@ -21,8 +21,13 @@ fi
|
||||
# rc on aarch64) gets the platform's default channel instead.
|
||||
channel=${OMARCHY_MIRROR:-}
|
||||
[[ -n $channel && -f $templates/pacman-$channel.conf ]] || channel=$(omarchy_pacman_default_channel "$platform")
|
||||
cp -f "$templates/pacman-$channel.conf" /etc/pacman.conf
|
||||
cp -f "$templates/mirrorlist-$channel" /etc/pacman.d/mirrorlist
|
||||
# Regions render x86 pacman only (omarchy #13690).
|
||||
if [[ $platform == x86 ]]; then
|
||||
"$OMARCHY_PATH/bin/omarchy-apply-pacman" "$channel"
|
||||
else
|
||||
cp -f "$templates/pacman-$channel.conf" /etc/pacman.conf
|
||||
cp -f "$templates/mirrorlist-$channel" /etc/pacman.d/mirrorlist
|
||||
fi
|
||||
|
||||
# An image build leaves the keyring to each machine's first boot, so no two
|
||||
# share a master key (install/helpers/image-target.sh).
|
||||
|
||||
Reference in new issue
Block a user