From 6d88b4bd9e85831bf4d9875b2c28ab165996568d Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Fri, 16 Apr 2004 11:41:13 +0000 Subject: [PATCH] Make check_unpackaged list the diff so one can actually see what's missing :) --- buildpkg.functions | 1 + buildpkg.packaging.solaris | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/buildpkg.functions b/buildpkg.functions index 251338a..8643601 100644 --- a/buildpkg.functions +++ b/buildpkg.functions @@ -60,6 +60,7 @@ UNIQ=/bin/uniq BASENAME=/bin/basename DIRNAME=/bin/dirname TR=/bin/tr +DIFF=/usr/local/bin/diff # *Must* support -u (like GNU Diff) # Groff stuff for manpages NEQN=/usr/local/bin/neqn diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris index 7de8f46..285fb60 100644 --- a/buildpkg.packaging.solaris +++ b/buildpkg.packaging.solaris @@ -340,12 +340,19 @@ parse_def() # params: none check_unpackaged() { + local upf + local i $FIND . -type f -print|$SED -e 's/\.\///g' > $tmpdir/files.tmp $FIND . -type l -print|$SED -e 's/\.\///g' >> $tmpdir/files.tmp $FIND . -type d -print|$SED -e 's/\.\///g'|$GREP -v '^\.' >> $tmpdir/files.tmp $SORT $metadir/files.tmp|$UNIQ > $tmpdir/f1 $SORT $tmpdir/files.tmp > $tmpdir/f2 if [ ! "$($CMP $tmpdir/f1 $tmpdir/f2)" == "" ]; then + upf="$($DIFF -u $tmpdir/f1 $tmpdir/f2)" + for i in $upf + do + echo $i + done $RM -f $tmpdir/f1 $tmpdir/f2 error $E_UNPACKAGED_FILES check_unpackaged fi