RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change Arch Linux site URL's 

Recently Arch Linux shed the www portion of its site. The links still work,
but it's a 301 redirection to archlinux.org. Changed all the URL's still pointing
to www.archlinux.org to avoid the unnecessary redirection, since on browsers the 301
is usually saved and respected, but command line tools line wget or python might not
save this and always go through the redirect.
This commit is contained in:
Giancarlo Razzolini 2021-01-22 13:34:44 -03:00
parent 1013153744
commit f48e5d59c6
No known key found for this signature in database
GPG Key ID: F22FB1D78A77AEAB
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/mirrors.py
View File

@ -16,7 +16,7 @@ def filter_mirrors_by_region(regions, destination='/etc/pacman.d/mirrorlist', tm
region_list = []
for region in regions.split(','):
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/mv {tmp_dir}/mirrorlist {destination}")))
@ -73,7 +73,7 @@ def re_rank_mirrors(top=10, *positionals, **kwargs):
return False
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)
regions = {}

4
archinstall/lib/packages.py
View File

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

2
docs/installing/binary.rst
View File

@ -49,4 +49,4 @@ Simply clone or download the source, and while standing in the cloned folder `./
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.

2
docs/installing/guided.rst
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
^^^^^^^^^^^^^^^^^^^
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::
When selecting *(or skipping)* this step. The installation will begin and your selected hard drive will be wiped after a 5 second countdown.