aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md21
-rw-r--r--kiss.121
2 files changed, 9 insertions, 33 deletions
diff --git a/README.md b/README.md
index 2d2cb7d..554f5ce 100644
--- a/README.md
+++ b/README.md
@@ -199,11 +199,14 @@ export CMAKE_GENERATOR=
## Alternatives system
-When a package with conflicts is installed with `KISS_CHOICE=1`, the conflicting files will be added as "choices" to the alternatives system.
+When a package with conflicts is installed the conflicting
+files will be added as "choices" to the alternatives system.
-Afterwards, running `kiss a`/`kiss alternatives` will list all of the choices you are able to make. Each line of output with this command is also usable directly as input.
+Afterwards, running kiss a/kiss alternatives will list all of
+the choices you are able to make. Each line of output with this
+command is also usable directly as input.
-**NOTE** If a package has fewer than 10 conflicting files, the conflicting files will automatically be added to the alternatives system.
+NOTE: To disable this functionality, set 'KISS_CHOICE=0'.
Example usage:
@@ -231,18 +234,6 @@ Example usage (complex):
```sh
-> kiss i sbase
# More lines...
-/var/db/kiss/installed/util-linux/manifest:/usr/bin/renice
-/var/db/kiss/installed/util-linux/manifest:/usr/bin/logger
-/var/db/kiss/installed/util-linux/manifest:/usr/bin/flock
-/var/db/kiss/installed/util-linux/manifest:/usr/bin/cal
-!> Package 'sbase' conflicts with another package
-!> Run 'KISS_CHOICE=1 kiss i sbase' to add conflicts
-!> as alternatives.
-
-# There were more than 10 conflicts so the alternatives system
-# must be manually enabled for this package.
--> KISS_CHOICE=1 kiss i sbase
-# More lines...
-> sbase Found conflict (/usr/bin/renice), adding choice
-> sbase Found conflict (/usr/bin/logger), adding choice
-> sbase Found conflict (/usr/bin/flock), adding choice
diff --git a/kiss.1 b/kiss.1
index 53d3213..07f848c 100644
--- a/kiss.1
+++ b/kiss.1
@@ -188,17 +188,14 @@ export CMAKE_GENERATOR=
.
.nf
-When a package with conflicts is installed with KISS_CHOICE=1,
-the conflicting files will be added as "choices" to the
-alternatives system.
+When a package with conflicts is installed the conflicting
+files will be added as "choices" to the alternatives system.
Afterwards, running kiss a/kiss alternatives will list all of
the choices you are able to make. Each line of output with this
command is also usable directly as input.
-NOTE: If a package has fewer than 10 conflicting files, the
-conflicting files will automatically be added to the alternatives
-system.
+NOTE: To disable this functionality, set 'KISS_CHOICE=0'.
Example usage:
@@ -223,18 +220,6 @@ Example usage (complex):
-> kiss i sbase
# More lines...
-/var/db/kiss/installed/util-linux/manifest:/usr/bin/renice
-/var/db/kiss/installed/util-linux/manifest:/usr/bin/logger
-/var/db/kiss/installed/util-linux/manifest:/usr/bin/flock
-/var/db/kiss/installed/util-linux/manifest:/usr/bin/cal
-!> Package 'sbase' conflicts with another package
-!> Run 'KISS_CHOICE=1 kiss i sbase' to add conflicts
-!> as alternatives.
-
-# There were more than 10 conflicts so the alternatives system
-# must be manually enabled for this package.
--> KISS_CHOICE=1 kiss i sbase
-# More lines...
-> sbase Found conflict (/usr/bin/renice), adding choice
-> sbase Found conflict (/usr/bin/logger), adding choice
-> sbase Found conflict (/usr/bin/flock), adding choice