From e66b5d95e9232ad57392c0ee1e20fefbb67df30f Mon Sep 17 00:00:00 2001 From: Marco D'Aleo Date: Tue, 9 Dec 2025 15:20:06 +0000 Subject: [PATCH] Edit badges, update installation instructions, swap github.com entries to git.sysmd.uk --- README.md | 60 +++++++++++++++++++++++++++++++++++++++++--------- pyproject.toml | 4 ++-- 2 files changed, 52 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 26091be..1c86efc 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -[![License](https://img.shields.io/github/license/guardutils/mirro?style=flat)](LICENCE) -[![Language](https://img.shields.io/github/languages/top/guardutils/mirro.svg)](https://github.com/guardutils/mirro/) -[![GitHub Release](https://img.shields.io/github/v/release/guardutils/mirro?display_name=release&logo=github)](https://github.com/guardutils/mirro/releases) -[![PyPI - Version](https://img.shields.io/pypi/v/mirro?logo=pypi)](https://pypi.org/project/mirro/#history) -[![PyPI downloads](https://img.shields.io/pypi/dm/mirro.svg)](https://pypi.org/project/mirro/) +[![Licence](https://img.shields.io/badge/GPL--3.0-orange?label=Licence)](https://git.sysmd.uk/guardutils/mirro/src/branch/main/LICENCE) +[![Gitea Release](https://img.shields.io/gitea/v/release/guardutils/mirro?gitea_url=https%3A%2F%2Fgit.sysmd.uk%2F&style=flat&color=orange&logo=gitea)](https://git.sysmd.uk/guardutils/mirro/releases) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-blue?logo=pre-commit&style=flat)](https://git.sysmd.uk/guardutils/mirro/src/branch/main/.pre-commit-config.yaml) # mirro @@ -160,20 +158,62 @@ Files with history in /foo/bar: ## Installation -### From package manager +### From GuardUtils package repo This is the preferred method of installation. -**Ubuntu 22.04 and 24.04** +### Debian/Ubuntu + +#### 1) Import the GPG key + +```bash +sudo mkdir -p /usr/share/keyrings +curl -fsSL https://repo.sysmd.uk/guardutils/guardutils.gpg | sudo gpg --dearmor -o /usr/share/keyrings/guardutils.gpg +``` + +The GPG fingerprint is `0032C71FA6A11EF9567D4434C5C06BD4603C28B1`. + +#### 2) Add the APT source + +```bash +echo "deb [arch=amd64 signed-by=/usr/share/keyrings/guardutils.gpg] https://repo.sysmd.uk debian main" | sudo tee /etc/apt/sources.list.d/guardutils.list +``` + +#### 3) Update and install + ``` -sudo add-apt-repository ppa:mdaleo/mirro sudo apt update sudo apt install mirro ``` -**Fedora 41, 42, 43** +### Fedora/RHEL + +#### 1) Import the GPG key + ``` -sudo dnf copr enable mdaleo/mirro +sudo rpm --import https://repo.sysmd.uk/guardutils/guardutils.gpg +``` + +#### 2) Add the repository configuration + +``` +sudo tee /etc/yum.repos.d/guardutils.repo > /dev/null << 'EOF' +[guardutils] +name = GuardUtils Repository +baseurl = https://repo.sysmd.uk/rpm/$basearch + +enabled = 1 +gpgcheck = 1 +gpgkey = https://repo.sysmd.uk/guardutils/guardutils.gpg + +repo_gpgcheck = 1 +EOF +``` + +#### 4) Update and install + +``` +sudo dnf upgrade --refresh sudo dnf install mirro ``` diff --git a/pyproject.toml b/pyproject.toml index 4d80d0b..24ab7e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,8 @@ description = "A safe editing wrapper: edits a temp copy, compares, and saves or authors = ["Marco D'Aleo "] license = "GPL-3.0-or-later" readme = "README.md" -homepage = "https://github.com/guardutils/mirro" -repository = "https://github.com/guardutils/mirro" +homepage = "https://git.sysmd.uk/guardutils/mirro" +repository = "https://git.sysmd.uk/guardutils/mirro" packages = [{include = "mirro", from = "src"}] [tool.poetry.dependencies] -- 2.49.1