Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
Date: Wed, 29 Apr 2020 06:39:29
Message-Id: 1588142358.8f37aa42f6bef7baf73a4ecc0bc2caafd4e7e546.robbat2@gentoo
1 commit: 8f37aa42f6bef7baf73a4ecc0bc2caafd4e7e546
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 29 06:39:18 2020 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 29 06:39:18 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=8f37aa42
7
8 wrapper: ensure locking
9
10 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
11
12 mirmon-wrapper.sh | 3 +++
13 1 file changed, 3 insertions(+)
14
15 diff --git a/mirmon-wrapper.sh b/mirmon-wrapper.sh
16 index 4c5570b..4fffee0 100755
17 --- a/mirmon-wrapper.sh
18 +++ b/mirmon-wrapper.sh
19 @@ -33,6 +33,8 @@ main() {
20 CONFFILE=$(readlink -f "${CONFDIR}"/mirmon.conf)
21 VAR_GMIRRORS=${VARDIR}/g.mirrors
22 EXTRA_MIRRORS=${CONFDIR}/g.mirrors.extra
23 + # Lock outselves
24 + [ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en "${VARDIR}/flock" "$0" "${OPTS[@]}" || :
25
26 # Grab mirrors from the web
27 mkdir -p "${VARDIR}" "${HTDOCS}" || die "Failed to mkdir"
28 @@ -148,4 +150,5 @@ done
29 [[ $INVALID -eq 1 ]] && usage
30 [[ $HELP -eq 1 ]] && dohelp
31
32 +OPTS=( ${opts} ) # for flock
33 main