Using a temporary folder is now optional

This commit is contained in:
Pierre Pronchery 2012-10-07 17:06:36 +00:00
parent 6df48c4206
commit fd2d6818f0

View File

@ -13,8 +13,6 @@
# #
#You should have received a copy of the GNU General Public License #You should have received a copy of the GNU General Public License
#along with this program. If not, see <http://www.gnu.org/licenses/>. #along with this program. If not, see <http://www.gnu.org/licenses/>.
#TODO:
#- no longer use a temporary folder
@ -26,9 +24,9 @@ DATE=`date '+%Y%m%d'`
DESTDIR="/var/www" DESTDIR="/var/www"
DEVNULL="/dev/null" DEVNULL="/dev/null"
EMAIL="webmaster@defora.org" EMAIL="webmaster@defora.org"
ROOT=$(mktemp -d -p "$HOME" "temp.XXXXXX") ROOT=
MODULE="DeforaOS" MODULE="DeforaOS"
SRC="$ROOT/$MODULE" SRC=
#executables #executables
CVS="cvs -q" CVS="cvs -q"
@ -71,8 +69,8 @@ _deforaos_document()
(cd "$SRC/Data/Documentation/DeforaOS Manual Pages" && (cd "$SRC/Data/Documentation/DeforaOS Manual Pages" &&
$MAKE && $MAKE &&
$MKDIR -- "$DESTDIR/htdocs/doc/manual" && $MKDIR -- "$DESTDIR/htdocs/doc/manual" &&
$FIND doc/manual -name "*.html" -exec \ $FIND "doc/manual" -name "*.html" -exec \
$INSTALL -- {} "$DESTDIR/htdocs/{}" \;) $INSTALL -- {} "$DESTDIR/htdocs/{}" \;)
#generic documentation #generic documentation
echo "" echo ""
@ -114,5 +112,7 @@ if [ $# -ne 0 ]; then
_usage _usage
exit $? exit $?
fi fi
[ -n "$ROOT" ] || ROOT=$(mktemp -d -p "$HOME" "temp.XXXXXX")
[ -n "$ROOT" ] || exit 2 [ -n "$ROOT" ] || exit 2
[ -n "$SRC" ] || SRC="$ROOT/$MODULE"
_deforaos_document 2>&1 | $MAIL -s "Daily CVS documentation: $DATE" "$EMAIL" _deforaos_document 2>&1 | $MAIL -s "Daily CVS documentation: $DATE" "$EMAIL"