summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-01-08 16:53:56 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-01-08 16:53:56 -0500
commite7d2dcac7cf857fdccd82bec2bfc2a7d8e6b85c6 (patch)
treeb66cfb7d4c5cc97c2da8c3d9b4cdf69fcd7efb66
parent4a0e623b0c8162b466695be7f5091c76b8c0b63b (diff)
Normalize to load ./config before loading ./db-functions
-rwxr-xr-xcreate-repo2
-rwxr-xr-xcron-jobs/repo-sanity-check2
-rwxr-xr-xcron-jobs/sourceballs22
-rwxr-xr-xdb-check-nonfree2
-rwxr-xr-xdb-list-unsigned-packages2
-rwxr-xr-xrepo-restore-to-normal2
6 files changed, 6 insertions, 6 deletions
diff --git a/create-repo b/create-repo
index 24b890d..21a2a9c 100755
--- a/create-repo
+++ b/create-repo
@@ -1,8 +1,8 @@
#!/bin/bash
# Creates repository structure
-. "$(dirname "$(readlink -e "$0")")/db-functions"
. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
if [ $# -eq 0 ]; then
msg "Usage: ${0##*/} repo1 [repo2 ... repoX]"
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 2aa7892..ee4c061 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,8 +1,8 @@
#!/bin/bash
# Solves issue165
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
. "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
# Traverse all repos
for _repo in ${PKGREPOS[@]}; do
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index bbe227d..1432bdf 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -5,8 +5,8 @@
# Remove the old sourceballs
dirname="$(dirname "$(readlink -e "$0")")"
-. "${dirname}/../db-functions"
. "${dirname}/../config"
+. "${dirname}/../db-functions"
. "${MAKEPKGCONF}"
pushd "${WORKDIR}" >/dev/null
diff --git a/db-check-nonfree b/db-check-nonfree
index 661daa6..5cb7f6f 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -1,7 +1,7 @@
#!/bin/bash
-. "$(dirname "$(readlink -e "$0")")/db-functions"
. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
if [ $# -ge 1 ]; then
warning "Calling ${0##*/} with a specific repository is not supported"
diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages
index 985d1c0..5105096 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")")/db-functions"
. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
if [ $# -lt 1 ]; then
msg "usage: ${0##*/} <architecture>"
diff --git a/repo-restore-to-normal b/repo-restore-to-normal
index 3636920..3fe4816 100755
--- a/repo-restore-to-normal
+++ b/repo-restore-to-normal
@@ -1,8 +1,8 @@
#!/bin/bash
# Solves issue165
-. "$(dirname "$(readlink -e "$0")")/db-functions"
. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
CLEANUP_DESTDIR=/home/parabolavnx/repo/pool/restore
PKGREPOS=(community)