commit:     d4fa1ffef9503e2a5f7f1151ffba5892a4049b24
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 20:41:58 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 20:42:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4fa1ffe

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 <AT> gentoo.org>

 sys-apps/less/files/lesspipe.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index 68ec0f67926..a393de07ec7 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" ;;

Reply via email to