[pkgsrc/trunk]: pkgsrc/mk/scripts Ensure that decompress_cat and tarprog alwa...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40cacd53ad64
branches:  trunk
changeset: 506970:40cacd53ad64
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jan 24 15:26:06 2006 +0000

description:
Ensure that decompress_cat and tarprog always have vaild default values
in the case where the user makes bad option choices on the command line.

diffstat:

 mk/scripts/extract |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r ca35549c51ae -r 40cacd53ad64 mk/scripts/extract
--- a/mk/scripts/extract        Tue Jan 24 15:21:31 2006 +0000
+++ b/mk/scripts/extract        Tue Jan 24 15:26:06 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: extract,v 1.15 2006/01/23 17:52:02 wiz Exp $
+# $NetBSD: extract,v 1.16 2006/01/24 15:26:06 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -146,6 +146,7 @@
 /*tar|/*pax)   tarprog="$extract_using" ;;
 *tar)          tarprog="${TAR}" ;;
 *pax)          tarprog="${PAX}" ;;
+*)             tarprog="${TAR}" ;;
 esac
 
 if ${TEST} -n "$exclude_file" -a ! -f "$exclude_file"; then
@@ -162,7 +163,7 @@
 *.gz|*.tgz|*.z)                decompress_cat="${GZCAT}" ;;
 *.bz2|*.tbz|*.tbz2)    decompress_cat="${BZCAT}" ;;
 *.Z)                   decompress_cat="${GZCAT}" ;;
--)                     decompress_cat="${CAT}" ;;
+*)                     decompress_cat="${CAT}" ;;
 esac
 
 # Derive the format of the archive based on the file extension.