Compare commits
4 Commits
v0.3.3
...
cdd3ba0cbd
| Author | SHA1 | Date | |
|---|---|---|---|
| cdd3ba0cbd | |||
|
eee00bb6ee
|
|||
| f9586bbd0e | |||
|
51a7001bf2
|
@@ -20,7 +20,7 @@ jobs:
|
|||||||
run: pip install pre-commit
|
run: pip install pre-commit
|
||||||
|
|
||||||
- name: Run pre-commit hooks
|
- name: Run pre-commit hooks
|
||||||
uses: pre-commit/action@v3.0.1
|
run: pre-commit run --all-files --color always
|
||||||
|
|
||||||
- name: Install pip-audit
|
- name: Install pip-audit
|
||||||
run: pip install pip-audit
|
run: pip install pip-audit
|
||||||
82
README.md
82
README.md
@@ -1,8 +1,6 @@
|
|||||||
[](LICENCE)
|
[](https://git.sysmd.uk/guardutils/resrm/src/branch/main/LICENCE)
|
||||||
[](https://github.com/guardutils/resrm/)
|

|
||||||
[](https://github.com/guardutils/resrm/releases)
|
[](https://git.sysmd.uk/guardutils/resrm/src/branch/main/.pre-commit-config.yaml)
|
||||||
[](https://pypi.org/project/resrm/#history)
|
|
||||||
[](https://pypi.org/project/resrm/)
|
|
||||||
|
|
||||||
# resrm
|
# 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.
|
> 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
|
## Installation
|
||||||
|
|
||||||
### From package manager
|
### From GuardUtils package repo
|
||||||
|
|
||||||
This is the preferred method of installation.
|
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 update
|
||||||
sudo apt install resrm
|
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
|
sudo dnf install resrm
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -74,7 +103,7 @@ pip install resrm
|
|||||||
### From this repository
|
### From this repository
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/guardutils/resrm.git
|
git clone https://git.sysmd.uk/guardutils/resrm.git
|
||||||
cd resrm/
|
cd resrm/
|
||||||
poetry install
|
poetry install
|
||||||
```
|
```
|
||||||
@@ -107,12 +136,21 @@ resrm --restore <id|name>
|
|||||||
resrm --empty
|
resrm --empty
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
## Trash Location
|
## Trash Location
|
||||||
|
|
||||||
Normal users: `~/.local/share/resrm/files`
|
Normal users: `~/.local/share/resrm/files`
|
||||||
|
|
||||||
Root user: `/root/.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
|
### TAB completion
|
||||||
Add this to your `.bashrc`
|
Add this to your `.bashrc`
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ description = "drop-in replacement for rm with undo/restore built-in."
|
|||||||
authors = ["Marco D'Aleo <marco@marcodaleo.com>"]
|
authors = ["Marco D'Aleo <marco@marcodaleo.com>"]
|
||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
homepage = "https://github.com/guardutils/resrm"
|
homepage = "https://git.sysmd.uk/guardutils/resrm"
|
||||||
repository = "https://github.com/guardutils/resrm"
|
repository = "https://git.sysmd.uk/guardutils/resrm"
|
||||||
packages = [{include = "resrm", from = "src"}]
|
packages = [{include = "resrm", from = "src"}]
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
|
|||||||
Reference in New Issue
Block a user