synthesis.sh: replace '-r' option by '-f' in "rm -r $lockfile".

Strictly speaking, forcing the delete should be unnecessary too, but it
can't harm in case the lock file is deleted from outside while the script
is running.

git-svn-id: https://svn.eduke32.com/eduke32@3999 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-08-11 15:28:40 +00:00
parent bf2c96c9a2
commit 5f19fe63c0

View file

@ -31,8 +31,8 @@ fi
if [ -f $lockfile ] if [ -f $lockfile ]
then then
echo "Build already in progress!" echo "Build already in progress!"
exit exit
else else
touch $lockfile touch $lockfile
fi fi
@ -49,7 +49,7 @@ lastrevision=`ls -A1 $output/????????-???? | tail -n1 | cut -d- -f2 | cut -d. -f
# If the log of HEAD contains DONT_BUILD, obey. # If the log of HEAD contains DONT_BUILD, obey.
if [ `echo $headlog | grep -q DONT_BUILD` ]; then if [ `echo $headlog | grep -q DONT_BUILD` ]; then
echo "HEAD requested to not build. Bailing out..." echo "HEAD requested to not build. Bailing out..."
rm -r $lockfile rm -f $lockfile
exit exit
fi fi
@ -87,7 +87,7 @@ then
if [ ! -e $i ] if [ ! -e $i ]
then then
echo "Build failed! Bailing out..." echo "Build failed! Bailing out..."
rm -r $lockfile rm -f $lockfile
exit exit
fi fi
done done
@ -108,7 +108,7 @@ then
if [ ! -e $i ] if [ ! -e $i ]
then then
echo "Build failed! Bailing out..." echo "Build failed! Bailing out..."
rm -r $lockfile rm -f $lockfile
exit exit
fi fi
done done
@ -127,7 +127,7 @@ then
if [ ! -e $i ] if [ ! -e $i ]
then then
echo "Build failed! Bailing out..." echo "Build failed! Bailing out..."
rm -r $lockfile rm -f $lockfile
exit exit
fi fi
done done
@ -192,8 +192,8 @@ then
# link eduke32_latest.zip to the new archive # link eduke32_latest.zip to the new archive
ln -sf $output/$date-$head/${basename}_${platform}_$date-$head.zip $output/eduke32_latest.zip ln -sf $output/$date-$head/${basename}_${platform}_$date-$head.zip $output/eduke32_latest.zip
rm -r $lockfile rm -f $lockfile
else else
echo "Nothing to do." echo "Nothing to do."
rm -r $lockfile rm -f $lockfile
fi fi