summaryrefslogtreecommitdiffstats
path: root/misc/ext.d
diff options
context:
space:
mode:
Diffstat (limited to 'misc/ext.d')
-rw-r--r--misc/ext.d/Makefile.in2
-rwxr-xr-xmisc/ext.d/archive.sh14
-rwxr-xr-xmisc/ext.d/image.sh15
-rw-r--r--misc/ext.d/text.sh.in7
4 files changed, 30 insertions, 8 deletions
diff --git a/misc/ext.d/Makefile.in b/misc/ext.d/Makefile.in
index 61fc57a..441152d 100644
--- a/misc/ext.d/Makefile.in
+++ b/misc/ext.d/Makefile.in
@@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
- $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+ $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/misc/ext.d/archive.sh b/misc/ext.d/archive.sh
index 840fd47..12beb01 100755
--- a/misc/ext.d/archive.sh
+++ b/misc/ext.d/archive.sh
@@ -32,6 +32,9 @@ do_view_action() {
lzma)
lzma -dc "${MC_EXT_FILENAME}" 2>/dev/null
;;
+ lzo)
+ lzop -dc "${MC_EXT_FILENAME}" 2>/dev/null
+ ;;
xz)
xz -dc "${MC_EXT_FILENAME}" 2>/dev/null
;;
@@ -65,6 +68,10 @@ do_view_action() {
lzma -dc "${MC_EXT_FILENAME}" 2>/dev/null | \
tar tvvf -
;;
+ tar.lzo|tzo)
+ lzop -dc "${MC_EXT_FILENAME}" 2>/dev/null | \
+ tar tvvf -
+ ;;
tar.xz)
xz -dc "${MC_EXT_FILENAME}" 2>/dev/null | \
tar tvvf -
@@ -114,6 +121,10 @@ do_view_action() {
lz4 -dc "${MC_EXT_FILENAME}" | \
cpio -itv 2>/dev/null
;;
+ cpio.lzo)
+ lzop -dc "${MC_EXT_FILENAME}" | \
+ cpio -itv 2>/dev/null
+ ;;
cpio.xz)
xz -dc "${MC_EXT_FILENAME}" | \
cpio -itv 2>/dev/null
@@ -177,6 +188,9 @@ do_open_action() {
lzma)
lzma -dc "${MC_EXT_FILENAME}" | ${pager}
;;
+ lzo)
+ lzop -dc "${MC_EXT_FILENAME}" | ${pager}
+ ;;
xz)
xz -dc "${MC_EXT_FILENAME}" | ${pager}
;;
diff --git a/misc/ext.d/image.sh b/misc/ext.d/image.sh
index 04307e0..c191225 100755
--- a/misc/ext.d/image.sh
+++ b/misc/ext.d/image.sh
@@ -12,14 +12,19 @@ do_view_action() {
filetype=$1
case "${filetype}" in
- jpeg)
- identify "${MC_EXT_FILENAME}"
- which exif >/dev/null 2>&1 && exif "${MC_EXT_FILENAME}" 2>/dev/null
- ;;
xpm)
- sxpm "${MC_EXT_FILENAME}"
+ [ -n "$DISPLAY" ] && sxpm "${MC_EXT_FILENAME}"
;;
*)
+ if which exif >/dev/null 2>&1; then
+ exif "${MC_EXT_FILENAME}" 2>/dev/null
+ E=$?
+ else
+ E=1
+ fi
+ if [ $E != 0 ] && which exiftool >/dev/null 2>&1; then
+ exiftool "${MC_EXT_FILENAME}" 2>/dev/null
+ fi
identify "${MC_EXT_FILENAME}"
;;
esac
diff --git a/misc/ext.d/text.sh.in b/misc/ext.d/text.sh.in
index 2bd6ca0..357f9e1 100644
--- a/misc/ext.d/text.sh.in
+++ b/misc/ext.d/text.sh.in
@@ -31,6 +31,9 @@ get_unpacker() {
man.lzma)
unpacker="lzma -dc"
;;
+ man.lzo)
+ unpacker="lzop -dc"
+ ;;
man.xz)
unpacker="xz -dc"
;;
@@ -67,7 +70,7 @@ do_view_action() {
nroff.ms)
nroff @MAN_FLAGS@ -ms "${MC_EXT_FILENAME}"
;;
- man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.xz|man.zst)
+ man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.lzo|man.xz|man.zst)
case "${MC_EXT_FILENAME}" in
*/log/*|*/logs/*)
${unpacker} "${MC_EXT_FILENAME}"
@@ -114,7 +117,7 @@ do_open_action() {
nroff.ms)
nroff @MAN_FLAGS@ -ms "${MC_EXT_FILENAME}" | ${pager}
;;
- man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.xz|man.zst)
+ man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.lzo|man.xz|man.zst)
case "${MC_EXT_FILENAME}" in
*/log/*|*/logs/*)
${unpacker} "${MC_EXT_FILENAME}"