[pkgsrc/trunk]: pkgsrc/mk/scripts Fix the case where -X excludefile is used s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad6c94577117
branches:  trunk
changeset: 506760:ad6c94577117
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Jan 21 18:21:08 2006 +0000

description:
Fix the case where -X excludefile is used so that we don't error out trying
to remove "".

diffstat:

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

diffs (37 lines):

diff -r 2b000b2c8066 -r ad6c94577117 mk/scripts/extract
--- a/mk/scripts/extract        Sat Jan 21 18:01:26 2006 +0000
+++ b/mk/scripts/extract        Sat Jan 21 18:21:08 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: extract,v 1.12 2006/01/21 18:01:26 jlam Exp $
+# $NetBSD: extract,v 1.13 2006/01/21 18:21:08 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -113,6 +113,7 @@
        ${ECHO} 1>&2 "usage: $self [-d dir] [-f format] [-t tarprog] [-X excludefile | -x] distfile [file ...]"
 }
 
+exitcode=0
 decompress_cat="${CAT}"
 exclude=no
 exclude_file=
@@ -218,8 +219,9 @@
                        set -- dummy; shift
                fi
                $decompress_cat "$distfile" |
-                       $tarprog ${EXTRACT_OPTS_TAR} $exclude_flag -xf - "$@" \
-                       && ${RM} -f $tmpfile
+                       $tarprog ${EXTRACT_OPTS_TAR} $exclude_flag -xf - "$@"
+               exitcode=$?
+               ${TEST} "$exclude" = "no" || ${RM} -f "$tmpfile"
                ;;
        *)
                ${ECHO} 1>&2 "$self: unknown tar program: $extract_using"
@@ -273,3 +275,5 @@
        exit 1
        ;;
 esac
+
+exit $exitcode