summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-01-19 14:34:56 +0100
committerErich Eckner <git@eckner.net>2018-01-19 14:34:56 +0100
commit2079d087514a884302b06de9bd61f91ca3984cd4 (patch)
treedbf8d2dba46d53db31696b7f37e83a133e389149
parentcc35dfaf2cf4c73c1c12129e6942bfb084db10a8 (diff)
downloadbuilder-2079d087514a884302b06de9bd61f91ca3984cd4.tar.xz
move mysql_command to conf/default.conf
-rwxr-xr-xbin/bootstrap-mysql2
-rwxr-xr-xbin/build-master-status-from-mysql2
-rwxr-xr-xbin/mysql-functions23
-rwxr-xr-xconf/default.conf3
4 files changed, 18 insertions, 12 deletions
diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 50aee38..20ddfa5 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -471,5 +471,5 @@ if [ -s "${tmp_dir}/new-stable-packages" ]; then
# shellcheck disable=SC2016
printf 'DROP TABLE `stable_packages`;\n'
} | \
- ${mysql_command% -e}
+ ${mysql_command}
fi
diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql
index d78d963..a416538 100755
--- a/bin/build-master-status-from-mysql
+++ b/bin/build-master-status-from-mysql
@@ -8,7 +8,7 @@
. "${base_dir}/bin/mysql-functions"
# shellcheck disable=SC2016
-${mysql_command} '
+${mysql_command} -e '
SELECT `build_slaves`.`name`,`build_slaves`.`operator`,`package_sources`.`pkgbase`,`build_slaves`.`last_connection`
FROM `build_slaves`
LEFT JOIN `build_assignments` ON
diff --git a/bin/mysql-functions b/bin/mysql-functions
index bcfb3ae..7b9e724 100755
--- a/bin/mysql-functions
+++ b/bin/mysql-functions
@@ -4,7 +4,10 @@
# shellcheck disable=SC2039
-mysql_command='mysql buildmaster -e'
+if [ -z "${base_dir}" ]; then
+ # just to make shellcheck happy
+ . 'conf/default.conf'
+fi
# base64_encode_each encode each line of stdin with base64
@@ -34,7 +37,7 @@ mysql_add_package_source() {
done
values="${values% }"
- ${mysql_command} "$(
+ ${mysql_command} -e "$(
printf 'INSERT IGNORE INTO package_sources'
{
printf ' ('
@@ -52,7 +55,7 @@ mysql_add_package_source() {
# mysql_add_binary_package $pkgbase $git_revision $mod_git_revision $upstream_package_repository $pkgname $sub_pkgrel $architecture $repository
-# shellcheck disable=SC2016,SC2086,SC2154
+# shellcheck disable=SC2016,SC2031,SC2086,SC2154
mysql_add_binary_package() {
local names='pkgbase git_revision mod_git_revision upstream_package_repository pkgname sub_pkgrel architecture repository'
local name
@@ -65,7 +68,7 @@ mysql_add_binary_package() {
shift
done
- ${mysql_command} "$(
+ ${mysql_command} -e "$(
printf 'INSERT IGNORE INTO binary_packages'
{
printf ' ('
@@ -96,7 +99,7 @@ mysql_add_binary_package() {
# mysql_show_binary_package $pkgname $pkgver $pkgrel $sub_pkgrel
-# shellcheck disable=SC2016,SC2086,SC2154
+# shellcheck disable=SC2016,SC2031,SC2086,SC2154
mysql_show_binary_package() {
local names='pkgname pkgver pkgrel sub_pkgrel'
local name
@@ -110,7 +113,7 @@ mysql_show_binary_package() {
done
local joint
- ${mysql_command} "$(
+ ${mysql_command} -e "$(
{
printf 'SELECT'
printf ' `%s`.`%s`,' \
@@ -161,7 +164,7 @@ mysql_add_install_target() {
base64 -w0
)
- ${mysql_command} "$(
+ ${mysql_command} -e "$(
printf 'INSERT IGNORE INTO `install_targets` (`name`)'
printf ' VALUES (from_base64("%s"))' \
"${install_target}"
@@ -401,7 +404,7 @@ mysql_generate_package_metadata() {
if [ -n "${forced_sub_pkgrel}" ]; then
echo "${forced_sub_pkgrel}"
else
- ${mysql_command} "$(
+ ${mysql_command} -e "$(
printf 'SELECT count(*) FROM `binary_packages` JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id` WHERE'
printf ' `binary_packages`.`%s`=from_base64("%s") AND' \
'epoch' "${epoch}" \
@@ -561,7 +564,7 @@ mysql_generate_package_metadata() {
done
printf '.' >&2
- ${mysql_command} "$(
+ ${mysql_command} -e "$(
if [ -s "${temp_dir}/add-build-assignments-command" ]; then
cat "${temp_dir}/add-build-assignments-command"
fi
@@ -600,7 +603,7 @@ mysql_sanity_check() {
"${temp_dir}/master-mirror-listing"
# shellcheck disable=SC2016
- ${mysql_command} '
+ ${mysql_command} -e '
SELECT `repositories`.`name`,`pkgname`,`epoch`,`pkgver`,`pkgrel`,`sub_pkgrel`,`architectures`.`name`
FROM `binary_packages`
JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id`
diff --git a/conf/default.conf b/conf/default.conf
index 69e15ad..b2882ac 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -108,6 +108,9 @@ mirror_update_command=''
# list of urls to trigger updates of the respective mirrors (used on build master only)
mirror_refresh_trigger_urls=''
+# command to access the mysql database
+mysql_command='mysql buildmaster'
+
# possibly pull in custom modifications
# shellcheck source=/dev/null