actually, flock all the scripts

Signed-off-by: Mattia Rizzolo <mapreri@ubuntu.com>

cron.sh

@@ -2,11 +2,8 @@
 
 set -euo pipefail
 
-# run only one verion of myself
-# shellcheck disable=2015
-[ "${FLOCKER:-}" != "$0" ] && exec env FLOCKER="$0" flock -E 0 -en "$0" "$0" "$@" || :
-
 base="$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd )"
+. "$base"/utils/flock.sh
 
 # Allow this script to be run only by ubuntu-it
 if [[ "$(whoami)" != "ubuntu-it" ]]; then

utils/flock.sh

+#!/bin/sh
+# run only one verion of myself
+# shellcheck disable=2015
+echo "$0"
+[ "${FLOCKER:-}" != "$0" ] && exec env FLOCKER="$0" flock -E 0 -en "$0" "$0" "$@" || :

utils/include.sh

@@ -17,6 +17,8 @@ base="$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd )"
 
 # Include all the utilities from the subfiles
 # shellcheck disable=1090
+. "${base}/flock.sh"  # prevent this script from running twice together
+# shellcheck disable=1090
 . "${base}/bzr.sh"
 # shellcheck disable=1090
 . "${base}/git.sh"