diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2afbb8e8..5b72a0ac 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: run check and tests in archlinux container + - name: run check and tests in arch linux container run: | docker run \ -v ${{ github.workspace }}:/build -w /build \ diff --git a/README.md b/README.md index 1b896549..7aac28a1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ArcHlinux ReposItory MANager +# ArcH Linux ReposItory MANager [![build status](https://github.com/arcan1s/ahriman/actions/workflows/run-tests.yml/badge.svg)](https://github.com/arcan1s/ahriman/actions/workflows/run-tests.yml) [![CodeFactor](https://www.codefactor.io/repository/github/arcan1s/ahriman/badge)](https://www.codefactor.io/repository/github/arcan1s/ahriman) @@ -26,7 +26,7 @@ $ ahriman --help usage: ahriman [-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--no-log] [--no-report] [--unsafe] [-v] {add,check,clean,config,create-user,init,key-import,rebuild,remove,remove-unknown,report,search,setup,sign,status,status-update,sync,update,web} ... -ArcHlinux ReposItory MANager +ArcH Linux ReposItory MANager optional arguments: -h, --help show this help message and exit diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 804726ae..59e32c2b 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -3,7 +3,7 @@ pkgname='ahriman' pkgver=1.2.6 pkgrel=1 -pkgdesc="ArcHlinux ReposItory MANager" +pkgdesc="ArcH Linux ReposItory MANager" arch=('any') url="https://github.com/arcan1s/ahriman" license=('GPL3') diff --git a/package/archlinux/ahriman.sysusers b/package/archlinux/ahriman.sysusers index 1ab8b466..6fd64e0a 100644 --- a/package/archlinux/ahriman.sysusers +++ b/package/archlinux/ahriman.sysusers @@ -1 +1 @@ -u ahriman 643 "ArcHlinux ReposItory MANager" /var/lib/ahriman \ No newline at end of file +u ahriman 643 "ArcH Linux ReposItory MANager" /var/lib/ahriman \ No newline at end of file diff --git a/package/lib/systemd/system/ahriman-web@.service b/package/lib/systemd/system/ahriman-web@.service index 77273c75..d720b864 100644 --- a/package/lib/systemd/system/ahriman-web@.service +++ b/package/lib/systemd/system/ahriman-web@.service @@ -1,5 +1,5 @@ [Unit] -Description=ArcHlinux ReposItory MANager web server (%I architecture) +Description=ArcH Linux ReposItory MANager web server (%I architecture) After=network.target [Service] diff --git a/package/lib/systemd/system/ahriman@.service b/package/lib/systemd/system/ahriman@.service index 236ebccc..6bb84407 100644 --- a/package/lib/systemd/system/ahriman@.service +++ b/package/lib/systemd/system/ahriman@.service @@ -1,5 +1,5 @@ [Unit] -Description=ArcHlinux ReposItory MANager (%I architecture) +Description=ArcH Linux ReposItory MANager (%I architecture) [Service] ExecStart=/usr/bin/ahriman --architecture %i update diff --git a/package/lib/systemd/system/ahriman@.timer b/package/lib/systemd/system/ahriman@.timer index ba3b9ece..653b2ee1 100644 --- a/package/lib/systemd/system/ahriman@.timer +++ b/package/lib/systemd/system/ahriman@.timer @@ -1,5 +1,5 @@ [Unit] -Description=ArcHlinux ReposItory MANager timer (%I architecture) +Description=ArcH Linux ReposItory MANager timer (%I architecture) [Timer] OnCalendar=daily diff --git a/package/share/ahriman/repo-index.jinja2 b/package/share/ahriman/repo-index.jinja2 index c1a85691..77f40ff1 100644 --- a/package/share/ahriman/repo-index.jinja2 +++ b/package/share/ahriman/repo-index.jinja2 @@ -11,7 +11,7 @@
-

Archlinux user repository

+

Arch Linux user repository

diff --git a/setup.py b/setup.py index e49160fc..40bfab40 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( version=metadata["__version__"], zip_safe=False, - description="ArcHlinux ReposItory MANager", + description="ArcH Linux ReposItory MANager", author="arcanis", author_email="", diff --git a/src/ahriman/application/ahriman.py b/src/ahriman/application/ahriman.py index c9be419b..2ef8e021 100644 --- a/src/ahriman/application/ahriman.py +++ b/src/ahriman/application/ahriman.py @@ -39,7 +39,7 @@ def _parser() -> argparse.ArgumentParser: command line parser generator :return: command line parser for the application """ - parser = argparse.ArgumentParser(prog="ahriman", description="ArcHlinux ReposItory MANager", + parser = argparse.ArgumentParser(prog="ahriman", description="ArcH Linux ReposItory MANager", formatter_class=argparse.ArgumentDefaultsHelpFormatter) parser.add_argument("-a", "--architecture", help="target architectures (can be used multiple times)", action="append") diff --git a/src/ahriman/models/package.py b/src/ahriman/models/package.py index f9ac734a..19676588 100644 --- a/src/ahriman/models/package.py +++ b/src/ahriman/models/package.py @@ -216,7 +216,7 @@ class Package: generate full version from components :param epoch: package epoch if any :param pkgver: package version - :param pkgrel: package release version (archlinux specific) + :param pkgrel: package release version (arch linux specific) :return: generated version """ prefix = f"{epoch}:" if epoch else "" diff --git a/tests/ahriman/conftest.py b/tests/ahriman/conftest.py index 91a0304c..4393d3b7 100644 --- a/tests/ahriman/conftest.py +++ b/tests/ahriman/conftest.py @@ -140,7 +140,7 @@ def package_description_ahriman() -> PackageDescription: archive_size=4200, build_date=42, depends=["devtools", "git", "pyalpm", "python-aur", "python-srcinfo"], - description="ArcHlinux ReposItory MANager", + description="ArcH Linux ReposItory MANager", filename="ahriman-0.12.1-1-any.pkg.tar.zst", groups=[], installed_size=4200000, diff --git a/tests/ahriman/core/upload/test_s3.py b/tests/ahriman/core/upload/test_s3.py index 110ed0e3..3561ce0e 100644 --- a/tests/ahriman/core/upload/test_s3.py +++ b/tests/ahriman/core/upload/test_s3.py @@ -31,7 +31,7 @@ def test_calculate_etag_small(resource_path_root: Path) -> None: must calculate checksum for path which is single chunk """ path = resource_path_root / "models" / "package_ahriman_srcinfo" - assert S3.calculate_etag(path, _chunk_size) == "04e75b4aa0fe6033e711e8ea98e059b2" + assert S3.calculate_etag(path, _chunk_size) == "a55f82198e56061295d405aeb58f4062" def test_remove_files(s3_remote_objects: List[Any]) -> None: diff --git a/tests/testresources/models/package_ahriman_srcinfo b/tests/testresources/models/package_ahriman_srcinfo index 40dababa..57e15e39 100644 --- a/tests/testresources/models/package_ahriman_srcinfo +++ b/tests/testresources/models/package_ahriman_srcinfo @@ -1,5 +1,5 @@ pkgbase = ahriman - pkgdesc = ArcHlinux ReposItory MANager + pkgdesc = ArcH Linux ReposItory MANager pkgver = 0.12.1 pkgrel = 1 url = https://github.com/arcan1s/ahriman