Skip to content

Commit

Permalink
prefer 7zip over now outdated p7zip
Browse files Browse the repository at this point in the history
  • Loading branch information
wofr06 committed Jan 28, 2024
1 parent 41b6334 commit e32be35
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
****************************************************************************
# ChangeLog for lesspipe.sh #
****************************************************************************
- use 7zip instead of now outdated p7zip if available
- propagate file extension to newly created temporary files
- use again csvlook for display of csv files if available
- use csvtable for tabular display of csv files, needs Text::CSV from perl
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,8 @@ filtering for certain file types.
(last checked: Jan 21 2023):

### 11.1 URLs to some utilities (with last known release)
- 7zr https://sourceforge.net/projects/p7zip/ (2016)
- 7zz https://sourceforge.net/projects/sevenzip/ (2023)
- 7zr (outdated!) https://sourceforge.net/projects/p7zip/ (2016)
- antiword no longer valid: https://www.winfield.demon.nl/ (2005)
- cabextract https://www.cabextract.org.uk/ (2019)
- catdoc,catppt,xls2csv https://www.wagner.pp.ru/~vitus/software/catdoc/ (2016)
Expand Down
5 changes: 3 additions & 2 deletions lesspipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ get_unpack_cmd () {
{ has_cmd bsdtar && prog=bsdtar; } ||
{ has_cmd cabextract && prog=cabextract; } ;;
7z-compressed)
{ has_cmd 7zz && prog=7zz; } ||
{ has_cmd 7zr && prog=7zr; } ||
{ has_cmd 7z && prog=7z; } ||
{ has_cmd 7za && prog=7za; } ;;
Expand Down Expand Up @@ -657,7 +658,7 @@ isarchive () {
istemp cabextract2 "$2" "$3" ;;
isoinfo)
istemp "isoinfo -i" "$2" "-x$3" ;;
7za|7zr)
7zz|7za|7zr)
istemp "$prog e -so" "$2" "$3"
esac
else
Expand All @@ -679,7 +680,7 @@ isarchive () {
isoinfo -d -i "$t"| grep -E '^Joliet' && joliet=J
separatorline
isoinfo -fR"$joliet" -i "$t" ;;
7za|7zr)
7zz|7za|7zr)
istemp "$prog l" "$2"
esac
fi
Expand Down

0 comments on commit e32be35

Please sign in to comment.