=================================================================== RCS file: /cvs/openbsd/update_openbsd/release.sh,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- openbsd/update_openbsd/release.sh 2014/11/08 20:32:55 1.35 +++ openbsd/update_openbsd/release.sh 2014/11/27 21:17:46 1.36 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: release.sh,v 1.34 2012/05/27 20:48:56 andrew Exp $ +# $AFresh1: release.sh,v 1.35 2014/11/08 20:32:55 andrew Exp $ # # Copyright (c) 2002, 2008 Steven Roberts # @@ -105,25 +105,25 @@ make_system_release() { echo "---------- Make and validate the system release ----------" -local _status=0 -export DESTDIR=$DEST; export RELEASEDIR=$RELEASE -if [ X"$DESTDIR" == X"" ]; then +if [ X"$DEST" == X"" ]; then echo PLEASE SET \$DEST! >2& - exit + exit 1 fi -mkdir -p $DESTDIR $RELEASEDIR -empty_dir $DESTDIR & -cd /usr/src/etc && ${SUDO} nice make release + +local _status=0 +local DESTDIR RELEASEDIR + +[ -e $DEST ] && empty_dir $DEST +${SUDO} install -d -g wheel -m 775 $DEST $RELEASE + +export DESTDIR=$DEST RELEASEDIR=$RELEASE +cd /usr/src/etc && ${SUDO} nice make SUDO="" release _status=$? -if [ $_status == 0 ]; then - cd /usr/src/distrib/sets && ${SUDO} sh checkflist - _status=$? -fi -unset DESTDIR RELEASEDIR -if [ $_status != 0 ]; then - echo System Release Failed - exit $_status -fi +[ $_status == 0 ] && cd /usr/src/distrib/sets && ${SUDO} sh checkflist +_status=$? + +[ $_status == 0 ] || echo System Release Failed +exit $_status } build_xenocara() {