diff --git a/src/deforaos-build.sh b/src/deforaos-build.sh index 56f23bb..7d6c605 100755 --- a/src/deforaos-build.sh +++ b/src/deforaos-build.sh @@ -5,6 +5,8 @@ +#environment +umask 022 #variables [ -z "$ARCH" ] && ARCH=`uname -m` case "$ARCH" in @@ -59,7 +61,9 @@ deforaos_build() { #configure cvs if necessary $MKDIR "$HOME" || exit 2 - [ ! -f "$HOME/.cvspass" ] && $TOUCH "$HOME/.cvspass" + if [ ! -f "$HOME/.cvspass" ]; then + $TOUCH "$HOME/.cvspass" || exit 2 + fi #checkout tree $RM -r "$SRC" diff --git a/src/deforaos-update.sh b/src/deforaos-update.sh index c85c03b..ae17846 100755 --- a/src/deforaos-update.sh +++ b/src/deforaos-update.sh @@ -5,11 +5,14 @@ +#environment +umask 022 #variables [ -z "$CVSROOT" ] && CVSROOT=":pserver:anonymous@anoncvs.defora.org:/home/cvs" #private DATE=`date '+%Y%m%d'` DESTDIR="/var/www" +DEVNULL="/dev/null" EMAIL="devel@lists.defora.org" MODULE="DeforaOS" SRC="$HOME/$MODULE" @@ -32,7 +35,9 @@ deforaos_update() { #configure cvs if necessary $MKDIR "$HOME" || exit 2 - ([ ! -f "$HOME/.cvspass" ] && $TOUCH "$HOME/.cvspass") || exit 2 + if [ ! -f "$HOME/.cvspass" ]; then + $TOUCH "$HOME/.cvspass" || exit 2 + fi #checkout tree if necessary if [ ! -d "$SRC" ]; then @@ -52,7 +57,7 @@ deforaos_update() $FIND "$SRC/System" "$SRC/Apps" -name "doc" | while read path; do [ -x "$path/docbook.sh" ] || continue for i in $path/*.xml; do - (cd "$path" && $MAKE install DESTDIR="$DESTDIR" PREFIX="/") + (cd "$path" && $MAKE install DESTDIR="$DESTDIR" PREFIX="/") 2> "$DEVNULL" done done