Minor fixes.

This commit is contained in:
gfk
2008-09-25 00:46:11 +00:00
parent 48cbc7d2d9
commit cf2cc58105
+8 -5
View File
@@ -9,7 +9,7 @@ CVS=/usr/bin/cvs
MAKE=/usr/bin/make MAKE=/usr/bin/make
PERL=/usr/bin/perl PERL=/usr/bin/perl
GUNZIP=/bin/gunzip GUNZIP=/bin/gunzip
BZIP2=/usr/bin/bzip2 BZIP2=/bin/bzip2
CVS2CL=/usr/bin/cvs2cl CVS2CL=/usr/bin/cvs2cl
RSYNC=/usr/bin/rsync RSYNC=/usr/bin/rsync
@@ -85,9 +85,10 @@ if [ -e README ] && [ -e ChangeLog ] && [ -e LCDd.conf ]; then
./configure --silent >/dev/null ./configure --silent >/dev/null
# Creation of the distribution # Creation of the distribution
${MAKE} dist dist-bzip2 >/dev/null &>/dev/null ${MAKE} dist >/dev/null &>/dev/null
mv lcdproc-*.tar.gz lcdproc-CVS-${BRANCH}.tar.gz mv lcdproc-*.tar.gz lcdproc-CVS-${BRANCH}.tar.gz
mv lcdproc-*.tar.bz2 lcdproc-CVS-${BRANCH}.tar.bz2 ${GUNZIP} --stdout lcdproc-CVS-${BRANCH}.tar.gz > lcdproc-CVS-${BRANCH}.tar
${BZIP2} --force --quiet lcdproc-CVS-${BRANCH}.tar
# Date of the last nightly # Date of the last nightly
echo "${TODAY}" > last-nightly.txt echo "${TODAY}" > last-nightly.txt
@@ -98,6 +99,7 @@ if [ -e README ] && [ -e ChangeLog ] && [ -e LCDd.conf ]; then
${SF_ACCOUNT},lcdproc@web.sourceforge.net:htdocs/nightly/ ${SF_ACCOUNT},lcdproc@web.sourceforge.net:htdocs/nightly/
mv lcdproc-CVS-${BRANCH}.tar.gz ${LCDPROC_DIR}/ mv lcdproc-CVS-${BRANCH}.tar.gz ${LCDPROC_DIR}/
rm lcdproc-CVS-${BRANCH}.tar.bz2
# Cleanup # Cleanup
mv configure.in.nightly-temp configure.in mv configure.in.nightly-temp configure.in
@@ -105,11 +107,12 @@ if [ -e README ] && [ -e ChangeLog ] && [ -e LCDd.conf ]; then
mv ChangeLog.nightly-temp ChangeLog mv ChangeLog.nightly-temp ChangeLog
rm -f nightly-cvsChanges.txt last-nightly.txt rm -f nightly-cvsChanges.txt last-nightly.txt
for dir in debian scripts/debian ; do for dir in debian scripts/debian ; do
test -d $dir && mv debian_changelog.nightly-temp $dir/changelog test -d $dir && cp debian_changelog.nightly-temp $dir/changelog
done done
rm debian_changelog.nightly-temp
# remove files generated by ./configure --silent # remove files generated by ./configure --silent
${MAKE} distclean ${MAKE} distclean >/dev/null &>/dev/null
# re-create files accidentially deleted # re-create files accidentially deleted
${CVS} update -d &> /dev/null ${CVS} update -d &> /dev/null