Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the output from the unpackaged files check much more readable.

Browse Source
This commit is contained in:
Tom G. Christensen 2004-07-14 10:08:11 +00:00
parent 0958686fd0
commit 5def702b56
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buildpkg.packaging.solaris
View File

@ -366,20 +366,27 @@ check_unpackaged()
{ {
local upf local upf
local i local i
local indent4=" "
$FIND . -type f -print|$SED -e 's/\.\///g' > $tmpdir/files.tmp $FIND . -type f -print|$SED -e 's/\.\///g' > $tmpdir/files.tmp
$FIND . -type l -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 $FIND . -type d -print|$SED -e 's/\.\///g'|$GREP -v '^\.' >> $tmpdir/files.tmp
$SORT $metadir/files.tmp|$UNIQ > $tmpdir/f1 $SORT $metadir/files.tmp|$UNIQ > $tmpdir/f1
$SORT $tmpdir/files.tmp > $tmpdir/f2 $SORT $tmpdir/files.tmp > $tmpdir/f2
if [ ! "$($CMP $tmpdir/f1 $tmpdir/f2)" == "" ]; then if [ ! "$($CMP $tmpdir/f1 $tmpdir/f2)" == "" ]; then
upf="$($DIFF -u $tmpdir/f1 $tmpdir/f2)" upf="$($CAT $tmpdir/f1 $tmpdir/f2 | $SORT | $UNIQ -u)"
if [ ! -z "$upf" ]; then
echo "There are unpackaged files in the stagedir:"
for i in $upf for i in $upf
do do
echo $i echo "${indent4}${i}"
done done
fi
$RM -f $tmpdir/f1 $tmpdir/f2 $RM -f $tmpdir/f1 $tmpdir/f2
if [ "$ignore_unpackaged_files" -eq 0 ]; then
error $E_UNPACKAGED_FILES check_unpackaged error $E_UNPACKAGED_FILES check_unpackaged
fi fi
fi
$RM -f $tmpdir/f1 $tmpdir/f2 $RM -f $tmpdir/f1 $tmpdir/f2
} }
@ -425,9 +432,7 @@ generic_pack()
setdir "$stagedir$prefix" setdir "$stagedir$prefix"
fi fi
parse_def parse_def
if [ "$ignore_unpackaged_files" -eq 0 ]; then
check_unpackaged check_unpackaged
fi
# Create a list of all the packages that we are going to build # Create a list of all the packages that we are going to build
for i in $(list_pkgs) for i in $(list_pkgs)
do do