match the code in use

This commit is contained in:
cd-builder user 2009-08-23 00:12:41 +00:00
parent 6b58c4755e
commit b1938abc1f
1 changed files with 11 additions and 3 deletions

View File

@ -68,7 +68,7 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
export MAXISOS=3; export MAXJIGDOS=ALL ;; export MAXISOS=3; export MAXJIGDOS=ALL ;;
esac esac
CDSTART=`date -u +%H:%M:%S` CDSTART=`date -u +%H:%M:%S`
unset DESKTOP unset DESKTOP
./testingcds "$arch" ./testingcds "$arch"
error=$? error=$?
CDEND=`date -u +%H:%M:%S` CDEND=`date -u +%H:%M:%S`
@ -161,9 +161,17 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
echo "Multi-arch DVD started at $DVDSTART, ended at $DVDEND, error $error" echo "Multi-arch DVD started at $DVDSTART, ended at $DVDEND, error $error"
mv $PUBDIRJIG/multi/jigdo-dvd/debian* $PUBDIRJIG/multi-arch/jigdo-dvd mv $PUBDIRJIG/multi/jigdo-dvd/debian* $PUBDIRJIG/multi-arch/jigdo-dvd
cat $PUBDIRJIG/multi/jigdo-dvd/MD5SUMS$SUMS_EXTENSION >> $PUBDIRJIG/multi-arch/jigdo-dvd/MD5SUMS$SUMS_EXTENSION for file in $PUBDIRJIG/multi/jigdo-dvd/*SUMS$SUMS_EXTENSION; do
outfile=$PUBDIRJIG/multi-arch/jigdo-dvd/`basename $file`
cat $file >> $outfile
done
mv $PUBDIRJIG/multi/iso-dvd/debian* $PUBDIRJIG/multi-arch/iso-dvd mv $PUBDIRJIG/multi/iso-dvd/debian* $PUBDIRJIG/multi-arch/iso-dvd
cat $PUBDIRJIG/multi/iso-dvd/MD5SUMS$SUMS_EXTENSION >> $PUBDIRJIG/multi-arch/iso-dvd/MD5SUMS$SUMS_EXTENSION for file in $PUBDIRJIG/multi/iso-dvd/*SUMS$SUMS_EXTENSION; do
outfile=$PUBDIRJIG/multi-arch/iso-dvd/`basename $file`
cat $file >> $outfile
done
rm -rf $PUBDIRJIG/multi rm -rf $PUBDIRJIG/multi
fi fi