|
From: Friedrich L. <fr...@us...> - 2006-05-25 18:29:33
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22319/build/scripts Modified Files: Tag: rel-1-2-patches build.sh Log Message: whitespacing fixed Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.79.2.9 retrieving revision 1.79.2.10 diff -u -d -r1.79.2.9 -r1.79.2.10 --- build.sh 25 May 2006 18:16:26 -0000 1.79.2.9 +++ build.sh 25 May 2006 18:29:30 -0000 1.79.2.10 @@ -129,29 +129,29 @@ for DIR in $SRCDIR $SRCEXTRADIR do - for TAR in $(ls $DIR/*.tar.bz2 2>/dev/null) - do - echo unpacking $TAR - ${NICE} tar -xjf $TAR || exit 1 - done + for TAR in $(ls $DIR/*.tar.bz2 2>/dev/null) + do + echo unpacking $TAR + ${NICE} tar -xjf $TAR || exit 1 + done - for TAR in $(ls $DIR/*.tar.gz 2>/dev/null) - do - echo unpacking $TAR - ${NICE} tar -xzf $TAR || exit 1 - done + for TAR in $(ls $DIR/*.tar.gz 2>/dev/null) + do + echo unpacking $TAR + ${NICE} tar -xzf $TAR || exit 1 + done - for TAR in $(ls $DIR/*.tgz 2>/dev/null) - do - echo unpacking $TAR - ${NICE} tar -xzf $TAR || exit 1 - done + for TAR in $(ls $DIR/*.tgz 2>/dev/null) + do + echo unpacking $TAR + ${NICE} tar -xzf $TAR || exit 1 + done - for TAR in $(ls $DIR/*.tar.Z 2>/dev/null) - do - echo unpacking $TAR - ${NICE} tar -xzf $TAR || exit 1 - done + for TAR in $(ls $DIR/*.tar.Z 2>/dev/null) + do + echo unpacking $TAR + ${NICE} tar -xzf $TAR || exit 1 + done done popd > /dev/null @@ -257,19 +257,19 @@ source $BUILD_CONFIG if [ "$CONFIG_USE_DISTCC" = "y" ] && [ -f /usr/bin/distccd ]; then - if [ -z "$DISTCC_HOSTS" ]; then - echo "ERROR" - echo "DISTCC_HOSTS is not defined!" - exit 1 - else - export DISTCC_HOSTS - fi - echo Killing running distccd... - killall distccd - sleep 1 - echo Starting distccd... - test -f /usr/bin/distccd && /usr/bin/distccd --daemon || exit 1 - export PATH=/usr/lib/distcc/bin:$PATH + if [ -z "$DISTCC_HOSTS" ]; then + echo "ERROR" + echo "DISTCC_HOSTS is not defined!" + exit 1 + else + export DISTCC_HOSTS + fi + echo Killing running distccd... + killall distccd + sleep 1 + echo Starting distccd... + test -f /usr/bin/distccd && /usr/bin/distccd --daemon || exit 1 + export PATH=/usr/lib/distcc/bin:$PATH fi mkdir -p $WORKDIR/LOGS/$CMD || exit 1 @@ -290,11 +290,11 @@ test -f /bin/arch.old || cp /bin/arch /bin/arch.old || exit 1 echo "/bin/uname -m" > /bin/arch || exit 1 else - echo "ERROR !!!" - echo "Could not determine Kernel Version (variable \$KERNELVERSION not set)" - exit 1 + echo "ERROR !!!" + echo "Could not determine Kernel Version (variable \$KERNELVERSION not set)" + exit 1 fi - + LINK=${LINK##/*/} SCRIPT=${LINK#S[0-9][0-9]} # only execute a special script if selected @@ -331,9 +331,9 @@ if [ -z "$RUN_ONLY_CMD" ];then if [ "$CONFIG_DISABLELOGGING" = "y" ]; then - ${NICE} $MYDIR/$SCRIPT $CMD + ${NICE} $MYDIR/$SCRIPT $CMD else - ${NICE} $MYDIR/$SCRIPT $CMD &> $WORKDIR/LOGS/$CMD/$SCRIPT + ${NICE} $MYDIR/$SCRIPT $CMD &> $WORKDIR/LOGS/$CMD/$SCRIPT fi else ${NICE} $MYDIR/$SCRIPT $CMD |