From 33cfe12c34747bd52e2730e45566e5b21cd76153 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 29 Apr 2012 10:10:43 +0200
Subject: Source the config before the functions as the latter references the
 former

---
 cron-jobs/ftpdir-cleanup  | 2 +-
 cron-jobs/integrity-check | 2 +-
 cron-jobs/sourceballs     | 2 +-
 cron-jobs/update-web-db   | 2 +-
 db-move                   | 2 +-
 db-remove                 | 2 +-
 db-repo-add               | 2 +-
 db-repo-remove            | 2 +-
 db-update                 | 2 +-
 test/lib/common.inc       | 2 +-
 testing2x                 | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 7839d50..9bc88d7 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../db-functions"
 . "$(dirname $0)/../config"
+. "$(dirname $0)/../db-functions"
 
 clean_pkg() {
 	local pkg
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index 044f093..f6c26cf 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -2,8 +2,8 @@
 
 dirname="$(dirname $0)"
 
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 
 script_lock
 
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index a24676d..d494905 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 dirname="$(dirname $(readlink -e $0))"
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 pushd "${WORKDIR}" >/dev/null
 
 script_lock
diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db
index b1767ca..195d1fc 100755
--- a/cron-jobs/update-web-db
+++ b/cron-jobs/update-web-db
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../db-functions"
 . "$(dirname $0)/../config"
+. "$(dirname $0)/../db-functions"
 
 # setup paths
 SPATH="/srv/http/archweb"
diff --git a/db-move b/db-move
index 9166a99..a23aebe 100755
--- a/db-move
+++ b/db-move
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
+. "$(dirname $0)/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: ${0##*/} <repo-from> <repo-to> <pkgname|pkgbase> ..."
diff --git a/db-remove b/db-remove
index 512ce51..da32c78 100755
--- a/db-remove
+++ b/db-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
+. "$(dirname $0)/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: ${0##*/} <repo> <arch> <pkgname|pkgbase> ..."
diff --git a/db-repo-add b/db-repo-add
index 99bb4b5..5d5b653 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
+. "$(dirname $0)/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: ${0##*/} <repo> <arch> <pkgfile> ..."
diff --git a/db-repo-remove b/db-repo-remove
index 43be772..2a693f4 100755
--- a/db-repo-remove
+++ b/db-repo-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
+. "$(dirname $0)/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: ${0##*/} <repo> <arch> <pkgname> ..."
diff --git a/db-update b/db-update
index a9d307f..8be0d54 100755
--- a/db-update
+++ b/db-update
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
+. "$(dirname $0)/db-functions"
 
 if [ $# -ge 1 ]; then
 	warning "Calling ${0##*/} with a specific repository is no longer supported"
diff --git a/test/lib/common.inc b/test/lib/common.inc
index 3001ad8..6efd517 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -2,7 +2,7 @@ set -E
 
 . "$(dirname ${BASH_SOURCE[0]})/../../config"
 # override the default TMPDIR
-export TMPDIR="$(mktemp -d /tmp/${0##*/}.XXXXXXXXXX)"
+TMPDIR="$(mktemp -d /tmp/${0##*/}.XXXXXXXXXX)"
 . "$(dirname ${BASH_SOURCE[0]})/../../db-functions"
 
 signpkg() {
diff --git a/testing2x b/testing2x
index caf6df1..f209e83 100755
--- a/testing2x
+++ b/testing2x
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
+. "$(dirname $0)/db-functions"
 
 if [ $# -lt 1 ]; then
 	msg "usage: ${0##*/} <pkgname|pkgbase> ..."
-- 
cgit v1.2.3-24-g4f1b