zless, znew: exit 1 upon --help or --version write failure

[debian/gzip] / zless.in

diff --git a/zless.in b/zless.in
index 25d6b8be72ae62d905d692c169f00f0cf7ee863b..e4da708f778740f388029e04ac24e4d5eaaa0ed2 100644 (file)
--- a/zless.in
+++ b/zless.in
@@ -17,9 +17,9 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 version="zless (gzip) @VERSION@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 version="zless (gzip) @VERSION@

-Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
+Copyright (C) 2007, 2011-2017 Free Software Foundation, Inc.

 This is free software.  You may redistribute copies of it under the terms of
 This is free software.  You may redistribute copies of it under the terms of

-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.

 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Paul Eggert."
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Paul Eggert."


@@ -32,8 +32,8 @@ Options are the same as for 'less'.
 Report bugs to <bug-gzip@gnu.org>."
 
 case $1 in
 Report bugs to <bug-gzip@gnu.org>."
 
 case $1 in

---help)    exec echo "$usage";;
---version) exec echo "$version";;
+--help)      printf '%s\n' "$usage"   || exit 1; exit;;
+--version)   printf '%s\n' "$version" || exit 1; exit;;

 esac
 
 if test "${LESSMETACHARS+set}" != set; then
 esac
 
 if test "${LESSMETACHARS+set}" != set; then


@@ -47,7 +47,7 @@ if test "${LESSMETACHARS+set}" != set; then
   export LESSMETACHARS
 fi
 
   export LESSMETACHARS
 fi
 

-less_version=`less -V` || exit
+less_version=`less -V 2>/dev/null`

 case $less_version in
 less' '45[1-9]* | \
 less' '4[6-9][0-9]* | \
 case $less_version in
 less' '45[1-9]* | \
 less' '4[6-9][0-9]* | \