Skip to content

Commit fea3602

Browse files
committed
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
1 parent 94373f2 commit fea3602

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

test/update-db

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@ function die() { log "$*; terminating."; echo "$program: Error: $*" 1>&2; exit 1
1414

1515

1616
for dir in /var/local /var/state /var/run /var/tmp; do
17-
[ -d $dir -a -w $dir ] && state=$dir/$program
17+
[ -d $dir -a -w $dir ] && state=$dir/$program && break
1818
done
1919
[ "$state" ] || die "Couldn't find a directory to keep state in."
2020
[ -d "$state" ] || mkdir $state
2121
[ "$state" ] || die "Couldn't create state dir."
2222

2323

24-
for dir in $DBLOCK /var/local /var/state /var/run /var/tmp; do
25-
[ -d $dir -a -w $dir ] && lock=$dir/$program
24+
for dir in $DBLOCK /var/lock /var/state /var/run /var/tmp; do
25+
[ -d $dir -a -w $dir ] && lock=$dir/$program && break
2626
done
2727
[ "$lock" ] || die "Couldn't find a directory to keep lock in."
28-
[ -d "$lock" ] || mkdir $lock
29-
[ "$lock" ] || die "Couldn't create lock dir."
3028

3129

3230
[ "$DBDUMP" ] || DBDUMP="$1"

0 commit comments

Comments
 (0)