mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Improve error handling when building a tree.

Browse Source 
- Remove -e, there are too many false positives (e.g. using diff to
  generate a patch for 'etcupdate diff', or the compare function) that
  it breaks.
- Bump to 0.2.

Reported by:	kan (2)
This commit is contained in:
John Baldwin 2010-08-04 15:55:58 +00:00
parent 47076b9bb0
commit 9c1b64af74
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=258781
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/etcupdate/Makefile
View File

@ -8,7 +8,7 @@
#
PORTNAME= etcupdate
PORTVERSION= 0.1
PORTVERSION= 0.2
CATEGORIES= sysutils
MASTER_SITES= # none
DISTFILES= # none

34
sysutils/etcupdate/src/etcupdate.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/sh
#
# Copyright (c) 2010 Advanced Computing Technologies LLC
# Written by: John H. Baldwin <jhb@FreeBSD.org>
@ -188,37 +188,29 @@ build_tree()
log "Building tree at $1 with $make"
mkdir -p $1/usr/obj >&3 2>&1
(cd $SRCDIR; $make DESTDIR=$1 distrib-dirs) >&3 2>&1
if [ $? -ne 0 ]; then
echo "Failed to build tree at $1"
return 1
fi
(cd $SRCDIR; $make DESTDIR=$1 distrib-dirs) >&3 2>&1 || return 1
if ! [ -n "$nobuild" ]; then
(cd $SRCDIR; \
MAKEOBJDIRPREFIX=$1/usr/obj $make _obj SUBDIR_OVERRIDE=etc &&
MAKEOBJDIRPREFIX=$1/usr/obj $make everything SUBDIR_OVERRIDE=etc &&
MAKEOBJDIRPREFIX=$1/usr/obj $make DESTDIR=$1 distribution) >&3 2>&1
>&3 2>&1
>&3 2>&1 || return 1
else
(cd $SRCDIR; $make DESTDIR=$1 distribution) >&3 2>&1
(cd $SRCDIR; $make DESTDIR=$1 distribution) >&3 2>&1 || return 1
fi
if [ $? -ne 0 ]; then
echo "Failed to build tree at $1"
return 1
fi
chflags -R noschg $1 >&3 2>&1
rm -rf $1/usr/obj >&3 2>&1
chflags -R noschg $1 >&3 2>&1 || return 1
rm -rf $1/usr/obj >&3 2>&1 || return 1
# Purge auto-generated files. Only the source files need to
# be updated after which these files are regenerated.
rm -f $1/etc/*.db $1/etc/passwd >&3 2>&1
rm -f $1/etc/*.db $1/etc/passwd >&3 2>&1 || return 1
# Remove empty files. These just clutter the output of 'diff'.
find $1 -type f -size 0 -delete >&3 2>&1
find $1 -type f -size 0 -delete >&3 2>&1 || return 1
# Trim empty directories.
find -d $1 -type d -empty -delete >&3 2>&1
find -d $1 -type d -empty -delete >&3 2>&1 || return 1
return 0
}
@ -229,14 +221,15 @@ extract_tree()
{
# If we have a tarball, extract that into the new directory.
if [ -n "$tarball" ]; then
(mkdir -p $NEWTREE && tar xf $tarball -C $NEWTREE) >&3 2>&1
if [ $? -ne 0 ]; then
if ! (mkdir -p $NEWTREE && tar xf $tarball -C $NEWTREE) \
>&3 2>&1; then
echo "Failed to extract new tree."
remove_tree $NEWTREE
exit 1
fi
else
if ! build_tree $NEWTREE; then
echo "Failed to build new tree."
remove_tree $NEWTREE
exit 1
fi
@ -1216,11 +1209,12 @@ build_cmd()
exit 1
fi
if ! build_tree $dir; then
echo "Failed to build tree."
remove_tree $dir
exit 1
fi
if ! tar cfj $1 -C $dir . >&3 2>&1; then
echo "Failed to create tarball ."
echo "Failed to create tarball."
remove_tree $dir
exit 1
fi