Quick & dirty update to support xz in diff/grep/more scripts.

2 files changed, 28 insertions, 17 deletions

diff --git a/src/scripts/lzmore b/src/scripts/xzmore
index d694774d..3ff3cbf7 100755
--- a/src/scripts/lzmore
+++ b/src/scripts/xzmore
@@ -2,7 +2,7 @@
 
 # Copyright (C) 2001 Free Software Foundation
 # Copyright (C) 1992, 1993 Jean-loup Gailly
-# Adapted to LZMA utils from gzip-1.3.3 + Red Hat's security patches
+# Adapted to XZ Utils from gzip-1.3.3 + Red Hat's security patches
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-if test "`echo "$0" | sed 's|.*/||'`" = "lzless"; then
-  PAGER=less
-fi
+case "$0" in
+  *less) PAGER=less ;;
+esac
 
 if test "`echo -n a`" = "-n a"; then
   # looks like a SysV system:
@@ -46,7 +46,7 @@ if test $# = 0; then
     if test -t 0; then
 	echo usage: zmore files...
     else
-	lzma -dc | eval ${PAGER-more}
+	xz -dc | eval ${PAGER-more}
     fi
 else
     FIRST=1
@@ -65,7 +65,7 @@ else
 	fi
 	if test "$ANS" != 's'; then
 		echo "------> $FILE <------"
-		lzma -dc "$FILE" | eval ${PAGER-more}
+		xz -dc -- "$FILE" | eval ${PAGER-more}
 	fi
 	if test -t; then
 		FIRST=0
diff --git a/src/scripts/lzmore.1 b/src/scripts/xzmore.1
index d92f95d3..dc76ac22 100644
--- a/src/scripts/lzmore.1
+++ b/src/scripts/xzmore.1
@@ -1,15 +1,22 @@
-.TH LZMORE 1 "30 Jun 2005" "LZMA utils"
+.\" Original file was take from gzip, thus this man page is under GNU GPLv2+.
+.TH XZMORE 1 "2009-04-13" "XZ Utils"
 .SH NAME
-lzmore, lzless \- view LZMA compressed (text) files
+xzmore, xzless, lzmore, lzless \- view .xz or .lzma compressed (text) files
 .SH SYNOPSIS
+.B xzmore
+.RI [ "filename ..."  ]
+.br
+.B xzless
+.RI [ "filename ..."  ]
+.br
 .B lzmore
 .RI [ "filename ..."  ]
 .br
 .B lzless
 .RI [ "filename ..."  ]
 .SH DESCRIPTION
-.B  lzmore
-is a filter which allows examination of LZMA compressed text files
+.B  xzmore
+is a filter which allows examination of .xz or .lzma compressed text files
 one screenful at a time on a soft-copy terminal.
 .PP
 To use a pager other than the default
@@ -19,18 +26,23 @@ set environment variable
 to the name of the desired program, such as
 .BR less .
 If
-.B lzmore
+.B xzmore
 is called as
-.B lzless
+.B xzless
 then
 .B less
 is used as the
 .BR PAGER .
+The names
+.B lzmore
+and
+.B lzless
+are provided for backward compatibility with LZMA Utils.
 .TP
 .BR e " or " q
 When the prompt --More--(Next file:
 .IR file )
-is printed, this command causes lzmore to exit.
+is printed, this command causes xzmore to exit.
 .TP
 .B s
 When the prompt --More--(Next file:
@@ -49,7 +61,6 @@ shipped in gzip package.
 .SH "SEE ALSO"
 .BR more (1),
 .BR zmore (1),
-.BR lzdiff (1),
-.BR lzgrep (1),
-.BR lzma (1),
-.BR lzmash (1)
+.BR xzdiff (1),
+.BR xzgrep (1),
+.BR xz (1)