Skip to content

Commit

Permalink
[eos-apps-info] updated doc about eos-pacdiff
Browse files Browse the repository at this point in the history
  • Loading branch information
manuel-192 committed Jan 25, 2024
1 parent 0cc4960 commit b0a4ce9
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 3 deletions.
4 changes: 2 additions & 2 deletions eos-apps-info/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pkgname=eos-apps-info
pkgdesc="Documentation about apps in the EndeavourOS repository."
pkgver=24
pkgver=24.1
pkgrel=1
arch=('any')
license=('GPL')
Expand Down Expand Up @@ -37,7 +37,7 @@ sha512sums=('8854670651e2185da652163cef9500c99dad8ed0cc3e10621ef4e1b569253749397
'48fab2cd10049ec673f79ed89a2865881c2c9882464824961978f7ee28ce33457ee611336b91c1f98ea2ac46b520aad5f63d2ce90156168f92241e1d3fe7b914'
'8a0692ff5e714a0690c7a90d04a928b2edf2e01515f8707b345d0da36ee95cab7f4f9badf3dca6cbd280438a08519957c5852be92e7936da9f0affef3d895b17'
'4b5eef3ce297cfa66d38b6ad92739eee905050228f72bd2c58d7f05700269b0ef434b0aa5c6ff8423a98af33918089f1255858bd2385ef3db2967d71e0d1d350'
'fb11865c304b7ede9bf2830ad11e6113c5c9246b0ae8fbc997da71b9477ab2511ad0b2b93da36d88d3098fbea8f6f144273927423aba45844dee2decadce453f')
'fe886245db18ae8cb0521191d11c2a1429da956dd334e2c2eb2e56943e28218e5ff96bc661222c8c412594a8fdef128bf84619536de0a264a498551e60ad2427')

package() {
local xx
Expand Down
Binary file modified eos-apps-info/eos-apps-info-pages.tar.gz
Binary file not shown.
40 changes: 39 additions & 1 deletion eos-apps-info/man/eos-pacdiff/eos-pacdiff.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,51 @@ Currently `meld` is the recommended file comparison program.

![](eos-pacdiff.png)

If you select the **View** mode, `meld` will help you choosing the modifications you want to apply.

![](meld.png)

## Synopsis

```
Usage: eos-pacdiff [options]
```

Run command

```
eos-pacdiff --help
```
to see the details about the options.

Tip: option `--backup` enables creating backup files (with .bak) in modes view, merge, overwrite. This is a great safety measure, and one might consider writing an alias like:

```
Usage: eos-pacdiff
alias pacdiff='eos-pacdiff --backup'
```

into file `~/.bashrc`.<br>
Option `--backup` enables creating backup files in all 3 modes mentioned above.

See also **Configuration** below.

## Configuration

File `/etc/pacdiff.conf` can contain the following (bash) variables, including their default values:

```
BACKUP_OVERWRITE=no
BACKUP_VIEW=no
BACKUP_MERGE=no
```

and their supported values are either `yes` or `no`.<br>
They define whether the original config file will be saved with suffix `.bak` or not.

_**Important note**_: if you want to be on the *safe* side, set the values of all `BACKUP_*` variables to `yes`. This creates the backup file also for any *critical* file (like `/etc/passwd`) if it was accidentally overwritten.

Tip: command line options (e.g. `--backup`) will override the configuration variables.

## See also

[pacdiff](https://man.archlinux.org/man/pacdiff.8)

0 comments on commit b0a4ce9

Please sign in to comment.