fix sources

35 files changed, 66 insertions, 66 deletions

diff --git a/any-to-ours b/any-to-ours
index ab34a1e..45d1994 100755
--- a/any-to-ours
+++ b/any-to-ours
@@ -7,8 +7,8 @@ trap_exit() {
 	exit 1
 }
 
-source "$(dirname "$(readlink -e "$0")")/config"
-source "$(dirname "$(readlink -e "$0")")/db-libremessages"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-libremessages"
 
 # From makepkg
 set -E
diff --git a/create-repo b/create-repo
index 5654078..c729e9c 100755
--- a/create-repo
+++ b/create-repo
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Creates repository structure
 
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-functions"
 
 if [ $# -eq 0 ]; then
 	msg "Usage: %s repo1 [repo2 ... repoX]" "${0##*/}"
@@ -18,4 +18,4 @@ for _repo in "$@"; do
 	done
 done
 
-msg "Don't forget to add them to the PKGREPOS array on %s" "$(dirname "$(readlink -e "$0")")/config"
+msg "Don't forget to add them to the PKGREPOS array on %s" "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
diff --git a/createrepos b/createrepos
index 1072c7f..4ebdefe 100755
--- a/createrepos
+++ b/createrepos
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Creates the repo structure defined in config
 
-source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
 
 mkdir -p -- "${root_dir}"/{"${PKGPOOL}","${SRCPOOL}"} "${cleanup_destination_directory}" "${source_cleanup_destination_directory}" "${staging_directory}"
 
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 2b32eae..6125829 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/../config"
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
+source "$(dirname "$(readlink -e "$0")")/../dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/../share/db-functions"
 
 clean_pkg() {
 	local pkg
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index 7896f32..cb01fc6 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -2,8 +2,8 @@
 
 dirname="$(dirname "$(readlink -e "$0")")"
 
-. "${dirname}/../config"
-. "${dirname}/../db-functions"
+source "${dirname}/../dbscripts.cfg"
+source "${dirname}/../share/db-functions"
 
 script_lock
 
diff --git a/cron-jobs/make_repo_torrents b/cron-jobs/make_repo_torrents
index bb59d2f..9b6c930 100755
--- a/cron-jobs/make_repo_torrents
+++ b/cron-jobs/make_repo_torrents
@@ -33,7 +33,7 @@ esac
 # pacman doesn't support multiple different packages of the same name,
 # so it's OK to just stuff all the torrents into a single directory.
 script_directory="$(dirname "$(readlink -e "$0")")/.."
-. "$(dirname "$(readlink -e "$0")")/../config"
+source "$(dirname "$(readlink -e "$0")")/../dbscripts.cfg"
 public_location="${root_dir}/"
 torrent_location="${root_dir}/torrents/"
 
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 203a740..1e796cd 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -4,8 +4,8 @@
 # repo", I don't know how the body of the issue is stored in the DB,
 # but the title says enough, I think.
 
-. "$(dirname "$(readlink -e "$0")")/../config"
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
+source "$(dirname "$(readlink -e "$0")")/../dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/../share/db-functions"
 
 # Traverse all repos
 for _repo in "${PKGREPOS[@]}"; do
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 53ffff9..8fa27a6 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 dirname="$(dirname "$(readlink -e "$0")")"
-. "${dirname}/../config"
-. "${dirname}/../db-functions"
+source "${dirname}/../dbscripts.cfg"
+source "${dirname}/../share/db-functions"
 pushd "${work_directory}" >/dev/null
 
 script_lock
diff --git a/db-check-nonfree b/db-check-nonfree
index 6fcc8ab..1d192e5 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-functions"
 
 if [ $# -ge 1 ]; then
 	error "Calling %s with a specific repository is not supported" "${0##*/}"
diff --git a/db-cleanup b/db-cleanup
index 10e3840..73e2719 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -15,8 +15,8 @@ trap_exit() {
 	exit 1
 }
 
-source "$(dirname "$(readlink -e "$0")")/config"
-source "$(dirname "$(readlink -e "$0")")/db-libremessages"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-libremessages"
 
 # From makepkg
 set -E
diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages
index e83002f..208d770 100755
--- a/db-list-unsigned-packages
+++ b/db-list-unsigned-packages
@@ -20,8 +20,8 @@ set -e
 # unsigned packages available for architecture $1 and specified for
 # architecture $2 (usually $1 or any, default is to list all).
 
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-functions"
 
 if [ $# -lt 1 ]; then
 	msg "usage: %s <architecture>" "${0##*/}"
diff --git a/db-move b/db-move
index b02ba3c..bebbd21 100755
--- a/db-move
+++ b/db-move
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: %s <repo-from> <repo-to> <pkgname|pkgbase> ..." "${0##*/}"
diff --git a/db-remove b/db-remove
index dcbe4b4..6f1aee3 100755
--- a/db-remove
+++ b/db-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: %s <repo> <arch> <pkgname|pkgbase> ..." "${0##*/}"
diff --git a/db-repo-add b/db-repo-add
index 024fce8..3b82ef2 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: %s <repo> <arch> <pkgfile> ..." "${0##*/}"
diff --git a/db-repo-remove b/db-repo-remove
index ab5f8f8..3754fa3 100755
--- a/db-repo-remove
+++ b/db-repo-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: %s <repo> <arch> <pkgname> ..." "${0##*/}"
diff --git a/db-sync b/db-sync
index dde21e3..dbab053 100755
--- a/db-sync
+++ b/db-sync
@@ -188,8 +188,8 @@ trap_exit() {
 	kill "-$signal" "$$"
 }
 
-source "$(dirname "$(readlink -e "$0")")/config"
-source "$(dirname "$(readlink -e "$0")")/db-libremessages"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-libremessages"
 
 # Check variables presence
 for var in database_extension_suffixfile files_extension_suffixfile mirror mirror_path work_directory blacklist_file root_dir ARCHSRCPOOLS ARCHPKGPOOLS; do
diff --git a/db-update b/db-update
index 6a62e43..ea8c22e 100755
--- a/db-update
+++ b/db-update
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
+source "$(dirname "$(readlink -e "$0")")/share/db-functions"
 
 if [ $# -ge 1 ]; then
 	warning "Calling %s with a specific repository is no longer supported" "${0##*/}"
diff --git a/config b/dbscripts.cfg
index 12f182e..044b21f 100644
--- a/config
+++ b/dbscripts.cfg
@@ -8,7 +8,7 @@ derivative_distributions=('gnu+linux_x86_arch_legacy' 'gnu+linux_arm_arch_legacy
 distributions=("${native_distributions}" "${derivative_distributions}")
 
 # add compability support
-source "$(dirname "$(readlink -e "$0")")/config.d/gnu+linux_x86_arch_legacy
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg.d/gnu+linux_x86_arch_legacy
 
 cleanup_destination_directory="${root_dir}/old/packages"
 cleanup_dryrun=false
diff --git a/mkrepo b/mkrepo
index b7b27f7..4fb2587 100755
--- a/mkrepo
+++ b/mkrepo
@@ -3,7 +3,7 @@
 # License: GPLv3+
 # Description: A script to quickly create new [repos]
 
-source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg"
 
 for repo in "$@"; do
 	echo ":: Creating [$repo]"
diff --git a/db-functions b/share/db-functions
index 9afb9e2..9afb9e2 100644
--- a/db-functions
+++ b/share/db-functions
diff --git a/db-libremessages b/share/db-libremessages
index 37df149..37df149 100755..100644
--- a/db-libremessages
+++ b/share/db-libremessages
diff --git a/test/lib/common.inc b/test/lib/common.inc
index c549ac9..1121724 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -1,7 +1,7 @@
 set -E
 
-. "$(dirname ${BASH_SOURCE[0]})/../../config"
-. "$(dirname ${BASH_SOURCE[0]})/../../db-functions"
+source "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.cfg"
+source "$(dirname ${BASH_SOURCE[0]})/../../share/db-functions"
 
 oneTimeSetUp() {
 	local p
@@ -55,7 +55,7 @@ setUp() {
 	local r
 	local a
 
-	[ -f "$(dirname ${BASH_SOURCE[0]})/../../config.local" ] && die "$(dirname ${BASH_SOURCE[0]})/../../config.local exists"
+	[ -f "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg" ] && die "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg exists"
 	temporary_directory="$(mktemp -d /dev/shm/$(basename $0).XXXXXXXXXX)"
 	#msg "Using ${temporary_directory}"
 
@@ -84,7 +84,7 @@ setUp() {
 		svn commit -q -m"initial commit of ${pkg}" "${temporary_directory}/svn-packages-copy"
 	done
 
-	cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../config.local"
+	cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg"
 	root_dir="${temporary_directory}/ftp"
 	SVN_repository="file://${temporary_directory}/svn-packages-repo"
 	PKGREPOS=(${PKGREPOS[@]})
@@ -97,12 +97,12 @@ setUp() {
 	source_cleanup_dryrun=false
 	require_signature=true
 eot
-	. "$(dirname ${BASH_SOURCE[0]})/../../config"
+	. "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.cfg"
 }
 
 tearDown() {
 	rm -rf "${temporary_directory}"
-	rm -f "$(dirname ${BASH_SOURCE[0]})/../../config.local"
+	rm -f "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg"
 	echo
 }
 
diff --git a/test/runTest b/test/runTest
index b8713d8..bb86983 100755
--- a/test/runTest
+++ b/test/runTest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(dirname ${BASH_SOURCE[0]})/lib/common.inc"
+source "$(dirname ${BASH_SOURCE[0]})/lib/common.inc"
 
 for t in "$(dirname ${BASH_SOURCE[0]})/test.d/"*.sh; do
 	l=$(basename ${t} .sh)
diff --git a/test/test.d/create-filelists.sh b/test/test.d/create-filelists.sh
index c1f43e9..b201eb2 100755
--- a/test/test.d/create-filelists.sh
+++ b/test/test.d/create-filelists.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testCreateSimpleFileLists() {
 	local arches=('i686' 'x86_64')
@@ -102,4 +102,4 @@ testCleanupFileLists() {
 
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/db-move.sh b/test/test.d/db-move.sh
index 04c8113..3445a46 100755
--- a/test/test.d/db-move.sh
+++ b/test/test.d/db-move.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testMoveSimplePackages() {
 	local arches=('i686' 'x86_64')
@@ -119,4 +119,4 @@ testMoveSplitPackages() {
 	checkRemovedAnyPackage testing pkg-split-a
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/db-remove.sh b/test/test.d/db-remove.sh
index 416e693..8ec5bd6 100755
--- a/test/test.d/db-remove.sh
+++ b/test/test.d/db-remove.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testRemovePackages() {
 	local arches=('i686' 'x86_64')
@@ -74,4 +74,4 @@ testRemoveAnyPackages() {
 	done
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/db-repo-add.sh b/test/test.d/db-repo-add.sh
index 7a201f9..01d53c4 100755
--- a/test/test.d/db-repo-add.sh
+++ b/test/test.d/db-repo-add.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testAddSimplePackages() {
 	local arches=('i686' 'x86_64')
@@ -51,4 +51,4 @@ testAddMultiplePackages() {
 	done
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/db-repo-remove.sh b/test/test.d/db-repo-remove.sh
index 315d63d..45d2ef2 100755
--- a/test/test.d/db-repo-remove.sh
+++ b/test/test.d/db-repo-remove.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testRemovePackages() {
 	local arches=('i686' 'x86_64')
@@ -55,4 +55,4 @@ testRemoveMultiplePackages() {
 	done
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh
index 3ce9037..08de911 100755
--- a/test/test.d/db-update.sh
+++ b/test/test.d/db-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testAddSimplePackages() {
 	local arches=('i686' 'x86_64')
@@ -162,4 +162,4 @@ testAddIncompleteSplitPackage() {
 	done
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/ftpdir-cleanup.sh b/test/test.d/ftpdir-cleanup.sh
index 4e7e1f5..5ba7fb3 100755
--- a/test/test.d/ftpdir-cleanup.sh
+++ b/test/test.d/ftpdir-cleanup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testCleanupSimplePackages() {
 	local arches=('i686' 'x86_64')
@@ -118,4 +118,4 @@ testCleanupSplitPackages() {
 	done
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/packages.sh b/test/test.d/packages.sh
index 5028448..13877d2 100755
--- a/test/test.d/packages.sh
+++ b/test/test.d/packages.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testPackages() {
 	# TODO: namcap -r sodepends fails with i686 packages
 	find "${pkgdir}" -name "*${package_extension_suffixfile}" -exec namcap -e sodepends,pkgnameindesc {} + || fail 'namcap failed'
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh
index 9f13d83..e74cf8b 100755
--- a/test/test.d/pool-transition.sh
+++ b/test/test.d/pool-transition.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testMovePackagesWithoutPool() {
 	local arches=('i686' 'x86_64')
@@ -149,4 +149,4 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
 	done
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/signed-packages.sh b/test/test.d/signed-packages.sh
index d7c5e57..8293d8a 100755
--- a/test/test.d/signed-packages.sh
+++ b/test/test.d/signed-packages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testAddUnsignedPackage() {
 	releasePackage extra 'pkg-simple-a' 'i686'
@@ -10,4 +10,4 @@ testAddUnsignedPackage() {
 	../db-update >/dev/null 2>&1 && fail "db-update should fail when a signature is missing!"
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/sourceballs.sh b/test/test.d/sourceballs.sh
index a34093a..d1adf1e 100755
--- a/test/test.d/sourceballs.sh
+++ b/test/test.d/sourceballs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testSourceballs() {
 	local arches=('i686' 'x86_64')
@@ -81,4 +81,4 @@ testSourceballsCleanup() {
 	[ ! -r ${root_dir}/${SRCPOOL}/pkg-simple-b-*${source_extension_suffixfile} ] && fail "source package not found!"
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"
diff --git a/test/test.d/testing2x.sh b/test/test.d/testing2x.sh
index d0d08d5..a291ee3 100755
--- a/test/test.d/testing2x.sh
+++ b/test/test.d/testing2x.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
+source "${curdir}/../lib/common.inc"
 
 testTesting2xAnyPackage() {
 	releasePackage core pkg-any-a any
@@ -24,4 +24,4 @@ testTesting2xAnyPackage() {
 	checkRemovedAnyPackage testing pkg-any-a
 }
 
-. "${curdir}/../lib/shunit2"
+source "${curdir}/../lib/shunit2"