diff --git a/README.md b/README.md index 21ce8ca..6486be4 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -[![License](https://img.shields.io/github/license/guardutils/resrm?style=flat)](LICENCE) -[![Language](https://img.shields.io/github/languages/top/guardutils/resrm.svg)](https://github.com/guardutils/resrm/) -[![GitHub Release](https://img.shields.io/github/v/release/guardutils/resrm?display_name=release&logo=github)](https://github.com/guardutils/resrm/releases) -[![PyPI - Version](https://img.shields.io/pypi/v/resrm?logo=pypi)](https://pypi.org/project/resrm/#history) -[![PyPI downloads](https://img.shields.io/pypi/dm/resrm.svg)](https://pypi.org/project/resrm/) +[![Licence](https://img.shields.io/badge/GPL--3.0-orange?label=Licence)](https://git.sysmd.uk/guardutils/resrm/src/branch/main/LICENCE) +![Gitea Release](https://img.shields.io/gitea/v/release/guardutils/resrm?gitea_url=https%3A%2F%2Fgit.sysmd.uk%2F&style=flat&color=orange&logo=gitea) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-blue?logo=pre-commit&style=flat)](https://git.sysmd.uk/guardutils/resrm/src/branch/main/.pre-commit-config.yaml) # resrm @@ -22,34 +20,65 @@ It moves files to a per-user _trash_ instead of permanently deleting them, while > Note: if you need immediate deletion, use the `--skip-trash` flag. ---- - -## Configuration - -To control how long trashed files are kept, add this line to your shell configuration (e.g. `~/.bashrc`): - -```bash -export RESRM_TRASH_LIFE=10 -``` - ---- ## 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/resrm sudo apt update sudo apt install resrm ``` -**Fedora 41, 42, 43** +### Fedora/RHEL + +#### 1) Import the GPG key + ``` -sudo dnf copr enable mdaleo/resrm +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 resrm ``` @@ -74,7 +103,7 @@ pip install resrm ### From this repository ```bash -git clone https://github.com/guardutils/resrm.git +git clone https://git.sysmd.uk/guardutils/resrm.git cd resrm/ poetry install ``` @@ -107,12 +136,21 @@ resrm --restore resrm --empty ``` + ## Trash Location Normal users: `~/.local/share/resrm/files` Root user: `/root/.local/share/resrm/files` +## Configuration + +To control how long trashed files are kept, add this line to your shell configuration (e.g. `~/.bashrc`): + +```bash +export RESRM_TRASH_LIFE=10 +``` + ### TAB completion Add this to your `.bashrc` ``` diff --git a/pyproject.toml b/pyproject.toml index 522e5d9..76bafdf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,8 @@ description = "drop-in replacement for rm with undo/restore built-in." authors = ["Marco D'Aleo "] license = "GPL-3.0-or-later" readme = "README.md" -homepage = "https://github.com/guardutils/resrm" -repository = "https://github.com/guardutils/resrm" +homepage = "https://git.sysmd.uk/guardutils/resrm" +repository = "https://git.sysmd.uk/guardutils/resrm" packages = [{include = "resrm", from = "src"}] [tool.poetry.dependencies]