diff options
-rwxr-xr-x | any-to-ours | 2 | ||||
-rwxr-xr-x | create-repo | 4 | ||||
-rwxr-xr-x | createrepos | 2 | ||||
-rwxr-xr-x | cron-jobs/ftpdir-cleanup | 2 | ||||
-rwxr-xr-x | cron-jobs/integrity-check | 2 | ||||
-rwxr-xr-x | cron-jobs/make_repo_torrents | 2 | ||||
-rwxr-xr-x | cron-jobs/repo-sanity-check | 2 | ||||
-rwxr-xr-x | cron-jobs/sourceballs | 2 | ||||
-rwxr-xr-x | db-check-nonfree | 2 | ||||
-rwxr-xr-x | db-cleanup | 2 | ||||
-rwxr-xr-x | db-list-unsigned-packages | 2 | ||||
-rwxr-xr-x | db-move | 2 | ||||
-rwxr-xr-x | db-remove | 2 | ||||
-rwxr-xr-x | db-repo-add | 2 | ||||
-rwxr-xr-x | db-repo-remove | 2 | ||||
-rwxr-xr-x | db-sync | 2 | ||||
-rwxr-xr-x | db-update | 2 | ||||
-rw-r--r-- | etc/dbscripts.cfg | 2 | ||||
-rw-r--r-- | etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg (renamed from etc/dbscripts.d/gnu+linux_arm_arch_legacy) | 0 | ||||
-rw-r--r-- | etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg (renamed from etc/dbscripts.d/gnu+linux_x86_arch_legacy) | 0 | ||||
-rwxr-xr-x | mkrepo | 2 | ||||
-rw-r--r-- | test/lib/common.inc | 10 |
22 files changed, 25 insertions, 25 deletions
diff --git a/any-to-ours b/any-to-ours index 45d1994..a55b62b 100755 --- a/any-to-ours +++ b/any-to-ours @@ -7,7 +7,7 @@ trap_exit() { exit 1 } -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-libremessages" # From makepkg diff --git a/create-repo b/create-repo index c729e9c..2ef3ace 100755 --- a/create-repo +++ b/create-repo @@ -1,7 +1,7 @@ #!/bin/bash # Creates repository structure -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-functions" if [ $# -eq 0 ]; then @@ -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")")/dbscripts.cfg" +msg "Don't forget to add them to the PKGREPOS array on %s" "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" diff --git a/createrepos b/createrepos index 4ebdefe..94fb9d5 100755 --- a/createrepos +++ b/createrepos @@ -1,7 +1,7 @@ #!/bin/bash # Creates the repo structure defined in config -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/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 6125829..fcf6879 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname "$(readlink -e "$0")")/../dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/../etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/../share/db-functions" clean_pkg() { diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index cb01fc6..b5e2de4 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -2,7 +2,7 @@ dirname="$(dirname "$(readlink -e "$0")")" -source "${dirname}/../dbscripts.cfg" +source "${dirname}/../etc/dbscripts.cfg" source "${dirname}/../share/db-functions" script_lock diff --git a/cron-jobs/make_repo_torrents b/cron-jobs/make_repo_torrents index 9b6c930..5f89db7 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")")/.." -source "$(dirname "$(readlink -e "$0")")/../dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/../etc/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 1e796cd..f98e8fa 100755 --- a/cron-jobs/repo-sanity-check +++ b/cron-jobs/repo-sanity-check @@ -4,7 +4,7 @@ # repo", I don't know how the body of the issue is stored in the DB, # but the title says enough, I think. -source "$(dirname "$(readlink -e "$0")")/../dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/../etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/../share/db-functions" # Traverse all repos diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index 8fa27a6..efa9523 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -1,7 +1,7 @@ #!/bin/bash dirname="$(dirname "$(readlink -e "$0")")" -source "${dirname}/../dbscripts.cfg" +source "${dirname}/../etc/dbscripts.cfg" source "${dirname}/../share/db-functions" pushd "${work_directory}" >/dev/null diff --git a/db-check-nonfree b/db-check-nonfree index 1d192e5..a1f54ee 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-functions" if [ $# -ge 1 ]; then @@ -15,7 +15,7 @@ trap_exit() { exit 1 } -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-libremessages" # From makepkg diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages index 208d770..1b2cf62 100755 --- a/db-list-unsigned-packages +++ b/db-list-unsigned-packages @@ -20,7 +20,7 @@ set -e # unsigned packages available for architecture $1 and specified for # architecture $2 (usually $1 or any, default is to list all). -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-functions" if [ $# -lt 1 ]; then @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-functions" if [ $# -lt 3 ]; then @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-functions" if [ $# -lt 3 ]; then diff --git a/db-repo-add b/db-repo-add index 3b82ef2..0813ecc 100755 --- a/db-repo-add +++ b/db-repo-add @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-functions" if [ $# -lt 3 ]; then diff --git a/db-repo-remove b/db-repo-remove index 3754fa3..bbab5af 100755 --- a/db-repo-remove +++ b/db-repo-remove @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-functions" if [ $# -lt 3 ]; then @@ -188,7 +188,7 @@ trap_exit() { kill "-$signal" "$$" } -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-libremessages" # Check variables presence @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-functions" if [ $# -ge 1 ]; then diff --git a/etc/dbscripts.cfg b/etc/dbscripts.cfg index 044b21f..fbce0b1 100644 --- a/etc/dbscripts.cfg +++ b/etc/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")")/dbscripts.cfg.d/gnu+linux_x86_arch_legacy +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg cleanup_destination_directory="${root_dir}/old/packages" cleanup_dryrun=false diff --git a/etc/dbscripts.d/gnu+linux_arm_arch_legacy b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg index 49b599e..49b599e 100644 --- a/etc/dbscripts.d/gnu+linux_arm_arch_legacy +++ b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg diff --git a/etc/dbscripts.d/gnu+linux_x86_arch_legacy b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg index 00c5fee..00c5fee 100644 --- a/etc/dbscripts.d/gnu+linux_x86_arch_legacy +++ b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg @@ -3,7 +3,7 @@ # License: GPLv3+ # Description: A script to quickly create new [repos] -source "$(dirname "$(readlink -e "$0")")/dbscripts.cfg" +source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" for repo in "$@"; do echo ":: Creating [$repo]" diff --git a/test/lib/common.inc b/test/lib/common.inc index 1121724..781737a 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -1,6 +1,6 @@ set -E -source "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.cfg" +source "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.cfg" source "$(dirname ${BASH_SOURCE[0]})/../../share/db-functions" oneTimeSetUp() { @@ -55,7 +55,7 @@ setUp() { local r local a - [ -f "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg" ] && die "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg exists" + [ -f "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.local.cfg" ] && die "$(dirname ${BASH_SOURCE[0]})/../../etc/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]})/../../dbscripts.local.cfg" + cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../etc/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]})/../../dbscripts.cfg" + . "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.cfg" } tearDown() { rm -rf "${temporary_directory}" - rm -f "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg" + rm -f "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.local.cfg" echo } |