From 80103377b779450c3a470ddaa2d620c9fdf75491 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 25 May 2018 10:50:24 +0200 Subject: conf/default.conf -> lib/load-configuration; conf/local.conf -> conf/{common,master,slave}.conf --- bin/bootstrap-mysql | 4 ++-- bin/build-master-status | 4 ++-- bin/build-packages | 4 ++-- bin/check-bugtracker | 4 ++-- bin/check-db-structure | 4 ++-- bin/check-opcodes | 4 ++-- bin/clean-cache | 4 ++-- bin/clean-git | 4 ++-- bin/cleanup | 4 ++-- bin/copy-to-build-support | 4 ++-- bin/db-update | 4 ++-- bin/delete-packages | 4 ++-- bin/filter-build-logs | 4 ++-- bin/find-obsolete-packages | 4 ++-- bin/get-assignment | 4 ++-- bin/get-package-updates | 4 ++-- bin/ii-answer | 4 ++-- bin/ii-connect | 4 ++-- bin/interpret-mail | 4 ++-- bin/modify-package-state | 4 ++-- bin/ping-from-slave | 4 ++-- bin/ping-to-master | 4 ++-- bin/prioritize-build-list | 4 ++-- bin/return-assignment | 4 ++-- bin/sanity-check | 4 ++-- bin/seed-build-list | 4 ++-- bin/show-dependencies | 4 ++-- bin/slave-build-connect | 4 ++-- bin/why-dont-you | 4 ++-- 29 files changed, 58 insertions(+), 58 deletions(-) (limited to 'bin') diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql index c3d7080..f05ffe8 100755 --- a/bin/bootstrap-mysql +++ b/bin/bootstrap-mysql @@ -2,8 +2,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" exec 9> "${build_list_lock_file}" if ! verbose_flock -n 9; then diff --git a/bin/build-master-status b/bin/build-master-status index d1382c7..c019a37 100755 --- a/bin/build-master-status +++ b/bin/build-master-status @@ -4,8 +4,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" tmp_dir=$(mktemp -d 'tmp.build-master-status.XXXXXXXXXX' --tmpdir) trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT diff --git a/bin/build-packages b/bin/build-packages index 3d5d2d1..da0ed16 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -6,8 +6,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # TODO: build other 'architectures', too (pentium4, i486) diff --git a/bin/check-bugtracker b/bin/check-bugtracker index 75f4995..53d8ffb 100755 --- a/bin/check-bugtracker +++ b/bin/check-bugtracker @@ -6,8 +6,8 @@ # shellcheck disable=SC2039,SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" bug_list=$( curl -LSs 'https://bugs.archlinux32.org/index.php?export_list=Export%20Tasklist' | \ diff --git a/bin/check-db-structure b/bin/check-db-structure index 7354bf4..436ce00 100755 --- a/bin/check-db-structure +++ b/bin/check-db-structure @@ -2,8 +2,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # stored functions diff --git a/bin/check-opcodes b/bin/check-opcodes index feaffc3..5965d50 100755 --- a/bin/check-opcodes +++ b/bin/check-opcodes @@ -2,8 +2,8 @@ # shellcheck disable=SC2086,SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" usage( ) { >&2 cat <&2 echo '' diff --git a/bin/get-assignment b/bin/get-assignment index 1c67279..ba80798 100755 --- a/bin/get-assignment +++ b/bin/get-assignment @@ -14,8 +14,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # TODO: honor manual build order of tool-chain: # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc diff --git a/bin/get-package-updates b/bin/get-package-updates index 59ec019..cfc0f74 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -6,8 +6,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # TODO: Find out, why sometimes package updates are missed. diff --git a/bin/ii-answer b/bin/ii-answer index 1e30ec1..f7c2d20 100755 --- a/bin/ii-answer +++ b/bin/ii-answer @@ -4,8 +4,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # welcome devs (in #archlinux32 only) welcome_user_regex='^\S\+ -!- \(abaumann\|deep42thought\|tyzoid\|phrik\)(.* has joined \S\+$' diff --git a/bin/ii-connect b/bin/ii-connect index 45eff65..4b9ecec 100755 --- a/bin/ii-connect +++ b/bin/ii-connect @@ -4,8 +4,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # start ii if it is not running if ! pgrep -x ii > /dev/null; then diff --git a/bin/interpret-mail b/bin/interpret-mail index a931cb7..e45c38f 100755 --- a/bin/interpret-mail +++ b/bin/interpret-mail @@ -2,8 +2,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # TODO: enable email interface to delete packages diff --git a/bin/modify-package-state b/bin/modify-package-state index 2ca2178..d5a201f 100755 --- a/bin/modify-package-state +++ b/bin/modify-package-state @@ -2,8 +2,8 @@ # shellcheck disable=SC2039,SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # shellcheck disable=SC2016 usage() { diff --git a/bin/ping-from-slave b/bin/ping-from-slave index 5ba8395..bb569dd 100755 --- a/bin/ping-from-slave +++ b/bin/ping-from-slave @@ -7,8 +7,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # TODO: receive/save some statistics about current build diff --git a/bin/ping-to-master b/bin/ping-to-master index 11dc7b8..3979656 100755 --- a/bin/ping-to-master +++ b/bin/ping-to-master @@ -7,8 +7,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # TODO: abort build if requested to diff --git a/bin/prioritize-build-list b/bin/prioritize-build-list index f5687e6..187cf29 100755 --- a/bin/prioritize-build-list +++ b/bin/prioritize-build-list @@ -2,8 +2,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" if [ $# -ne 1 ]; then echo 'Usage: prioritize-build-list pkg-regex' diff --git a/bin/return-assignment b/bin/return-assignment index dd13925..fdb7e1c 100755 --- a/bin/return-assignment +++ b/bin/return-assignment @@ -18,8 +18,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" if [ -s "${work_dir}/build-master-sanity" ]; then >&2 echo 'Build master is not sane.' diff --git a/bin/sanity-check b/bin/sanity-check index d5b86db..bfe6400 100755 --- a/bin/sanity-check +++ b/bin/sanity-check @@ -4,8 +4,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" usage() { >&2 echo '' diff --git a/bin/seed-build-list b/bin/seed-build-list index 7540f14..3a71429 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -4,8 +4,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # shellcheck disable=SC2016 usage() { diff --git a/bin/show-dependencies b/bin/show-dependencies index 111a41b..7eb4ead 100755 --- a/bin/show-dependencies +++ b/bin/show-dependencies @@ -2,8 +2,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # TODO: can this be faster? diff --git a/bin/slave-build-connect b/bin/slave-build-connect index d22597b..7d01e4c 100755 --- a/bin/slave-build-connect +++ b/bin/slave-build-connect @@ -2,8 +2,8 @@ # shellcheck disable=SC2119,SC2120 -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" if [ "x${SSH_ORIGINAL_COMMAND%% *}" = 'xget-assignment' ] || \ [ "x${SSH_ORIGINAL_COMMAND%% *}" = 'xreturn-assignment' ] || \ diff --git a/bin/why-dont-you b/bin/why-dont-you index f31c38c..7117bed 100755 --- a/bin/why-dont-you +++ b/bin/why-dont-you @@ -6,8 +6,8 @@ # investigate, why a certain operation is not done with certain packages -# shellcheck source=../conf/default.conf -. "${0%/*}/../conf/default.conf" +# shellcheck source=../lib/load-configuration +. "${0%/*}/../lib/load-configuration" # TODO: reintrocude "keep", "stubbornly_keep", "stabilize" and "unstage" # using information from the database. -- cgit v1.2.3-70-g09d2