From 5f19fe63c01255f38c2ea26f071953ce1cae51e3 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 11 Aug 2013 15:28:40 +0000 Subject: [PATCH] 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 --- polymer/synthesis.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/polymer/synthesis.sh b/polymer/synthesis.sh index 5122f80fa..e08d6852a 100755 --- a/polymer/synthesis.sh +++ b/polymer/synthesis.sh @@ -31,8 +31,8 @@ fi if [ -f $lockfile ] then - echo "Build already in progress!" - exit + echo "Build already in progress!" + exit else touch $lockfile 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 [ `echo $headlog | grep -q DONT_BUILD` ]; then echo "HEAD requested to not build. Bailing out..." - rm -r $lockfile + rm -f $lockfile exit fi @@ -87,7 +87,7 @@ then if [ ! -e $i ] then echo "Build failed! Bailing out..." - rm -r $lockfile + rm -f $lockfile exit fi done @@ -108,7 +108,7 @@ then if [ ! -e $i ] then echo "Build failed! Bailing out..." - rm -r $lockfile + rm -f $lockfile exit fi done @@ -127,7 +127,7 @@ then if [ ! -e $i ] then echo "Build failed! Bailing out..." - rm -r $lockfile + rm -f $lockfile exit fi done @@ -192,8 +192,8 @@ then # link eduke32_latest.zip to the new archive ln -sf $output/$date-$head/${basename}_${platform}_$date-$head.zip $output/eduke32_latest.zip - rm -r $lockfile + rm -f $lockfile else echo "Nothing to do." - rm -r $lockfile + rm -f $lockfile fi