Merge pull request #92 from grazzolini/change_arch_site

Change Arch Linux site URL's
This commit is contained in:
Anton Hvornum 2021-01-22 17:41:19 +01:00 committed by GitHub
commit 97b8bbb7d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -16,7 +16,7 @@ def filter_mirrors_by_region(regions, destination='/etc/pacman.d/mirrorlist', tm
region_list = [] region_list = []
for region in regions.split(','): for region in regions.split(','):
region_list.append(f'country={region}') region_list.append(f'country={region}')
o = b''.join(sys_command((f"/usr/bin/wget 'https://www.archlinux.org/mirrorlist/?{'&'.join(region_list)}&protocol=https&ip_version=4&ip_version=6&use_mirror_status=on' -O {tmp_dir}/mirrorlist"))) o = b''.join(sys_command((f"/usr/bin/wget 'https://archlinux.org/mirrorlist/?{'&'.join(region_list)}&protocol=https&ip_version=4&ip_version=6&use_mirror_status=on' -O {tmp_dir}/mirrorlist")))
o = b''.join(sys_command((f"/usr/bin/sed -i 's/#Server/Server/' {tmp_dir}/mirrorlist"))) o = b''.join(sys_command((f"/usr/bin/sed -i 's/#Server/Server/' {tmp_dir}/mirrorlist")))
o = b''.join(sys_command((f"/usr/bin/mv {tmp_dir}/mirrorlist {destination}"))) o = b''.join(sys_command((f"/usr/bin/mv {tmp_dir}/mirrorlist {destination}")))
@ -73,7 +73,7 @@ def re_rank_mirrors(top=10, *positionals, **kwargs):
return False return False
def list_mirrors(): def list_mirrors():
url = f"https://www.archlinux.org/mirrorlist/?protocol=https&ip_version=4&ip_version=6&use_mirror_status=on" url = f"https://archlinux.org/mirrorlist/?protocol=https&ip_version=4&ip_version=6&use_mirror_status=on"
response = urllib.request.urlopen(url) response = urllib.request.urlopen(url)
regions = {} regions = {}

View File

@ -2,8 +2,8 @@ import urllib.request, urllib.parse
import ssl, json import ssl, json
from .exceptions import * from .exceptions import *
BASE_URL = 'https://www.archlinux.org/packages/search/json/?name={package}' BASE_URL = 'https://archlinux.org/packages/search/json/?name={package}'
BASE_GROUP_URL = 'https://www.archlinux.org/groups/x86_64/{group}/' BASE_GROUP_URL = 'https://archlinux.org/groups/x86_64/{group}/'
def find_group(name): def find_group(name):
ssl_context = ssl.create_default_context() ssl_context = ssl.create_default_context()

View File

@ -49,4 +49,4 @@ Simply clone or download the source, and while standing in the cloned folder `./
nuitka3 --standalone --show-progress archinstall nuitka3 --standalone --show-progress archinstall
This requires the `nuitka <https://www.archlinux.org/packages/community/any/nuitka/>`_ package as well as `python3` to be installed locally. This requires the `nuitka <https://archlinux.org/packages/community/any/nuitka/>`_ package as well as `python3` to be installed locally.

View File

@ -100,7 +100,7 @@ There is a list of profiles to choose from. If you are unsure of what any of the
Additional packages Additional packages
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
Some additional packages can be installed if need be. This step allows you to list *(space separated)* officially supported packages from the `package database <https://www.archlinux.org/packages/>`_. Some additional packages can be installed if need be. This step allows you to list *(space separated)* officially supported packages from the `package database <https://archlinux.org/packages/>`_.
.. warning:: .. warning::
When selecting *(or skipping)* this step. The installation will begin and your selected hard drive will be wiped after a 5 second countdown. When selecting *(or skipping)* this step. The installation will begin and your selected hard drive will be wiped after a 5 second countdown.