From fea3602d824f0770c21841f9d3e2ba19ebccdc5a Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 18 Jun 2007 22:59:55 +0000 Subject: [PATCH] Break on finding a suitable directory for lock and state files. Dont create the lock directory when looking for an acceptable place. - Legacy-Id: 523 --- test/update-db | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/update-db b/test/update-db index da166ab2d..96bc17f27 100755 --- a/test/update-db +++ b/test/update-db @@ -14,19 +14,17 @@ function die() { log "$*; terminating."; echo "$program: Error: $*" 1>&2; exit 1 for dir in /var/local /var/state /var/run /var/tmp; do - [ -d $dir -a -w $dir ] && state=$dir/$program + [ -d $dir -a -w $dir ] && state=$dir/$program && break done [ "$state" ] || die "Couldn't find a directory to keep state in." [ -d "$state" ] || mkdir $state [ "$state" ] || die "Couldn't create state dir." -for dir in $DBLOCK /var/local /var/state /var/run /var/tmp; do - [ -d $dir -a -w $dir ] && lock=$dir/$program +for dir in $DBLOCK /var/lock /var/state /var/run /var/tmp; do + [ -d $dir -a -w $dir ] && lock=$dir/$program && break done [ "$lock" ] || die "Couldn't find a directory to keep lock in." -[ -d "$lock" ] || mkdir $lock -[ "$lock" ] || die "Couldn't create lock dir." [ "$DBDUMP" ] || DBDUMP="$1"