From d384cd8395fb0a0e0686f3c1ddac883002563f9a Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 10:27:41 +0100
Subject: source bin/mysql-functions in conf/default.conf - just like
 bin/common-functions - because it is now needed almost everywhere

---
 bin/bootstrap-mysql                | 2 --
 bin/build-master-status-from-mysql | 2 --
 bin/db-update                      | 2 --
 bin/get-package-updates            | 2 --
 conf/default.conf                  | 2 ++
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 3069863..fcb2f7e 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -2,8 +2,6 @@
 
 # shellcheck source=conf/default.conf
 . "${0%/*}/../conf/default.conf"
-# shellcheck source=bin/mysql-functions
-. "${base_dir}/bin/mysql-functions"
 
 tmp_dir=$(mktemp -d 'tmp.bootstrap-mysql.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql
index 85185b7..12278be 100755
--- a/bin/build-master-status-from-mysql
+++ b/bin/build-master-status-from-mysql
@@ -4,8 +4,6 @@
 
 # shellcheck source=conf/default.conf
 . "${0%/*}/../conf/default.conf"
-# shellcheck source=bin/mysql-functions
-. "${base_dir}/bin/mysql-functions"
 
 # shellcheck disable=SC2016
 {
diff --git a/bin/db-update b/bin/db-update
index 1417820..5b32214 100755
--- a/bin/db-update
+++ b/bin/db-update
@@ -29,8 +29,6 @@
 # shellcheck source=conf/default.conf
 . "${0%/*}/../conf/default.conf"
 
-. "${base_dir}/bin/mysql-functions"
-
 # shellcheck disable=SC2016
 usage() {
   >&2 echo ''
diff --git a/bin/get-package-updates b/bin/get-package-updates
index 763d01a..daa68a7 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -7,8 +7,6 @@
 # shellcheck source=conf/default.conf
 . "${0%/*}/../conf/default.conf"
 
-. "${base_dir}/bin/mysql-functions"
-
 # TODO: Find out, why sometimes package updates are missed.
 
 # shellcheck disable=SC2016
diff --git a/conf/default.conf b/conf/default.conf
index b2882ac..6ee991b 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -16,6 +16,8 @@ fi
 
 # shellcheck source=bin/common-functions
 . "${base_dir}/bin/common-functions"
+# shellcheck source=bin/mysql-functions
+. "${base_dir}/bin/mysql-functions"
 
 work_dir="${base_dir}/work"
 
-- 
cgit v1.2.3-70-g09d2