summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2020-09-13 21:41:58 +0100
committerJames Le Cuirot <chewi@gentoo.org>2020-09-13 21:42:51 +0100
commitd4fa1ffef9503e2a5f7f1151ffba5892a4049b24 (patch)
treea0abd287bd5f62bfd98b40e9c93c4bc72b3d1584 /sys-apps/less
parentmail-filter/amavisd-new: Drop old 2.12.0-r3 (diff)
downloadgentoo-d4fa1ffef9503e2a5f7f1151ffba5892a4049b24.tar.gz
gentoo-d4fa1ffef9503e2a5f7f1151ffba5892a4049b24.tar.bz2
gentoo-d4fa1ffef9503e2a5f7f1151ffba5892a4049b24.zip
sys-apps/less: Fix lesspipe handling of *.arj archives
unarj is being last-rited so prefer arj. The way unarj was being called was also broken for years. Bug: https://bugs.gentoo.org/694746 Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'sys-apps/less')
-rw-r--r--sys-apps/less/files/lesspipe.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index 68ec0f67926d..a393de07ec7b 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Preprocessor for 'less'. Used when this environment variable is set:
@@ -135,7 +135,7 @@ lesspipe() {
*.cpi|*.cpio) cpio -itv < "$1" ;;
*.ace) unace l "$1" ;;
*.arc) arc v "$1" ;;
- *.arj) unarj l -- "$1" ;;
+ *.arj) arj l -- "$1" || unarj l "$1" ;;
*.cab) cabextract -l -- "$1" ;;
*.lha|*.lzh) lha v "$1" ;;
*.zoo) zoo -list "$1" || unzoo -l "$1" ;;