From eb492f94077b115b84aa0249532277c690426c8f Mon Sep 17 00:00:00 2001 From: seb Date: Sat, 23 Aug 2003 19:40:18 +0000 Subject: Update to version 0.113. Pkgvi fix: deal with pathnames like `dir-with.a-dot/file-without-dot' for which the temporary file pathname hold in $tmp ended up as `dir-with.a-dot/file-without-dot.$$.a-dot/file-without-dot'. --- pkgtools/pkgdiff/Makefile | 4 ++-- pkgtools/pkgdiff/files/pkgvi | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'pkgtools/pkgdiff') diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile index 47397574298..f109b33f0bc 100644 --- a/pkgtools/pkgdiff/Makefile +++ b/pkgtools/pkgdiff/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2003/07/17 22:52:17 grant Exp $ +# $NetBSD: Makefile,v 1.40 2003/08/23 19:40:18 seb Exp $ # -DISTNAME= pkgdiff-0.112 +DISTNAME= pkgdiff-0.113 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools devel MASTER_SITES= # empty diff --git a/pkgtools/pkgdiff/files/pkgvi b/pkgtools/pkgdiff/files/pkgvi index 4b51b9c03df..6618dbffa1b 100755 --- a/pkgtools/pkgdiff/files/pkgvi +++ b/pkgtools/pkgdiff/files/pkgvi @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: pkgvi,v 1.8 2003/07/16 01:38:27 grant Exp $ +# $NetBSD: pkgvi,v 1.9 2003/08/23 19:40:19 seb Exp $ # # Copyright (c) 2001 Tomasz Luchowski. All rights reserved. # @@ -67,12 +67,15 @@ then exit 0 fi -tmp="$file.$$" +bfile=`basename $file` +dfile=`dirname $file` -ext=`echo $file | awk -F. '{ print $NF }'` +ext=`echo $bfile | awk -F. '{ print $NF }'` -if [ "$file" != "$ext" ]; then - tmp=$tmp.$ext +if [ "$bfile" != "$ext" ]; then + tmp="$dfile/$bfile.$$.$ext" +else + tmp="$file.$$" fi cp "$file" "$tmp" -- cgit v1.2.3