From 5c7220a4aa370d1f726eb27d99d8f9294646433d Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 19 Dec 2011 14:40:07 +0100
Subject: Avoid calls to basename

---
 cron-jobs/ftpdir-cleanup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cron-jobs/ftpdir-cleanup')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index bb1661a..7839d50 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -16,7 +16,7 @@ clean_pkg() {
 				if [ -e "$pkg.sig" ]; then
 					mv -f "$pkg.sig" "$CLEANUP_DESTDIR"
 				fi
-				touch "${CLEANUP_DESTDIR}/$(basename ${pkg})"
+				touch "${CLEANUP_DESTDIR}/${pkg##*/}"
 			fi
 		done
 	fi
-- 
cgit v1.2.3-54-g00ecf


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(-)

(limited to 'cron-jobs/ftpdir-cleanup')

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-54-g00ecf


From c639ae7d7a9fa5544d495e0b4d4f3b49611a7af9 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 10 Jun 2012 11:45:59 +0200
Subject: Remove support for packages in legacy $repo/os/any directories

---
 cron-jobs/ftpdir-cleanup       |  23 ---------
 test/lib/common.inc            |  17 +++----
 test/test.d/pool-transition.sh | 104 -----------------------------------------
 3 files changed, 7 insertions(+), 137 deletions(-)

(limited to 'cron-jobs/ftpdir-cleanup')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 9bc88d7..15eb46c 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -75,29 +75,6 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-# cleanup of legacy $repo/os/any directories
-for repo in ${PKGREPOS[@]}; do
-	if [ ! -d "${FTP_BASE}/${repo}/os/any" ]; then
-		continue
-	fi
-	if [ -n "$(find "${FTP_BASE}/${repo}/os/any" -type d -empty)" ]; then
-		msg "Removing empty legacy directory ${repo}/os/any"
-		${CLEANUP_DRYRUN} || rmdir "${FTP_BASE}/${repo}/os/any"
-		continue
-	fi
-	find "${FTP_BASE}/${repo}/os/any" -name "*${PKGEXT}" -printf '%f\n' | sort > "${WORKDIR}/any-${repo}"
-	cat "${WORKDIR}/db-${repo}-"* | sort -u > "${WORKDIR}/all-${repo}"
-
-	old_pkgs=($(comm -23 "${WORKDIR}/any-${repo}" "${WORKDIR}/all-${repo}"))
-	if [ ${#old_pkgs[@]} -ge 1 ]; then
-		msg "Removing old packages from [${repo}] (any)..."
-		for old_pkg in ${old_pkgs[@]}; do
-			msg2 "${old_pkg}"
-			clean_pkg "${FTP_BASE}/${repo}/os/any/${old_pkg}"
-		done
-	fi
-done
-
 old_pkgs=($(find ${CLEANUP_DESTDIR} -type f -name "*${PKGEXT}" -mtime +${CLEANUP_KEEP} -printf '%f\n'))
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from the cleanup directory..."
diff --git a/test/lib/common.inc b/test/lib/common.inc
index 6efd517..827c207 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -82,7 +82,7 @@ setUp() {
 
 	for r in ${PKGREPOS[@]}; do
 		mkdir -p "${TMP}/staging/${r}"
-		for a in ${ARCHES[@]} any; do
+		for a in ${ARCHES[@]}; do
 			mkdir -p "${TMP}/ftp/${r}/os/${a}"
 		done
 	done
@@ -169,18 +169,15 @@ checkAnyPackageDB() {
 			[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig")" == "${FTP_BASE}/${PKGPOOL}/${pkg}.sig" ] \
 				|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${PKGPOOL}/${pkg}.sig"
 		fi
+
+		for db in ${DBEXT} ${FILESEXT}; do
+			( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" ] \
+				&& bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" -O | grep -q ${pkg}) \
+				|| fail "${pkg} not in ${repo}/os/${arch}/${repo}${db%.tar.*}"
+		done
 	done
 	[ -r "${STAGING}"/${repo}/${pkg} ] && fail "${repo}/${pkg} found in staging dir"
 	[ -r "${STAGING}"/${repo}/${pkg}.sig ] && fail "${repo}/${pkg}.sig found in staging dir"
-
-	for db in ${DBEXT} ${FILESEXT}; do
-		( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" ] \
-			&& bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" -O | grep -q ${pkg}) \
-			|| fail "${pkg} not in ${repo}/os/${arch}/${repo}${db%.tar.*}"
-	done
-
-	[ -r "${FTP_BASE}/${repo}/os/any/${pkg}" ] && fail "${repo}/os/any/${pkg} should not exist"
-	[ -r "${FTP_BASE}/${repo}/os/any/${pkg}.sig" ] && fail "${repo}/os/any/${pkg}.sig should not exist"
 }
 
 checkAnyPackage() {
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh
index 4912968..7880b0a 100755
--- a/test/test.d/pool-transition.sh
+++ b/test/test.d/pool-transition.sh
@@ -45,108 +45,4 @@ testMovePackagesWithoutPool() {
 	done
 }
 
-testUpdateAnyPackageWithoutPool() {
-	local pkgname='pkg-any-a'
-	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
-	local pkg2='pkg-any-a-1-2-any.pkg.tar.xz'
-	local arch
-
-
-	releasePackage extra pkg-any-a any
-	../db-update
-	# transform two packages to old style layout
-	mv -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" "${FTP_BASE}/extra/os/any"
-	for arch in i686 x86_64; do
-		ln -sf "../any/${pkg1}" "${FTP_BASE}/extra/os/${arch}"
-	done
-
-	pushd "${TMP}/svn-packages-copy/${pkgname}/trunk/" >/dev/null
-	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	sudo extra-i686-build >/dev/null 2>&1
-	mv "${pkg2}" "${pkgdir}/${pkgname}/"
-	popd >/dev/null
-
-	releasePackage extra ${pkgname} any
-	../db-update
-	rm -f "${pkgdir}/${pkgname}/${pkg2}"
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	checkAnyPackage extra "${pkg2}"
-
-	[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
-	for arch in any i686 x86_64; do
-		[ -f "${FTP_BASE}/extra/os/${arch}/${pkg1}" ] && fail "extra/os/${arch}/${pkg1} found"
-	done
-}
-
-testMoveAnyPackagesWithoutPool() {
-	local pkgs=('pkg-any-a' 'pkg-any-b')
-	local pkgbase
-	local arch
-	local pkg
-
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase} any
-	done
-
-	../db-update
-
-	# transform a package to old style layout
-	for pkg in "${pkgdir}/${pkgs[0]}"/*-any${PKGEXT}; do
-		pkg=${pkg##*/}
-		mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
-		for arch in i686 x86_64; do
-			ln -sf "../any/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
-		done
-	done
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	../db-move testing extra ${pkgs[@]}
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	for pkgbase in ${pkgs[@]}; do
-		for pkg in "${pkgdir}/${pkgbase}"/*-any${PKGEXT}; do
-			checkAnyPackage extra ${pkg##*/}
-		done
-		checkRemovedAnyPackage testing ${pkgbase}
-	done
-
-	for pkg in "${pkgdir}/${pkgs[0]}"/*-any${PKGEXT}; do
-		pkg=${pkg##*/}
-		for arch in any i686 x86_64; do
-			[ -f "${FTP_BASE}/testing/os/${arch}/${pkg}" ] && fail "testing/os/${arch}/${pkg} found"
-		done
-	done
-}
-
-testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
-	local pkg
-	local arch
-
-	releasePackage extra pkg-any-a any
-	../db-update
-
-	# transform a package to old style layout
-	for pkg in "${pkgdir}/pkg-any-a"/*-any${PKGEXT}; do
-		pkg=${pkg##*/}
-		mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/extra/os/any/${pkg}"
-		for arch in i686 x86_64; do
-			ln -sf "../any/${pkg}" "${FTP_BASE}/extra/os/${arch}/${pkg}"
-		done
-	done
-
-	releasePackage testing pkg-any-a any
-	../db-update >/dev/null 2>&1 && (fail 'Adding an existing package to another repository should fail'; return 1)
-
-	for arch in i686 x86_64; do
-		( [ -r "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" ] \
-			&& bsdtar -xf "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep -q pkg-any-a) \
-			&& fail "pkg-any-a should not be in testing/os/${arch}/testing${DBEXT%.tar.*}"
-	done
-}
-
 . "${curdir}/../lib/shunit2"
-- 
cgit v1.2.3-54-g00ecf


From c2ad0298b74877bb2cd85f8f0e899460714bb019 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Mon, 7 Jan 2013 12:08:30 +0100
Subject: ftpdir-cleanup: fix ACL issues on nymeria

Signed-off-by: Florian Pritz <bluewind@xinu.at>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 cron-jobs/ftpdir-cleanup | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'cron-jobs/ftpdir-cleanup')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 15eb46c..e1294bd 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -3,6 +3,15 @@
 . "$(dirname $0)/../config"
 . "$(dirname $0)/../db-functions"
 
+# just like mv -f, but we touch the file and then copy the content so
+# default ACLs in the target dir will be applied
+mv_acl() {
+	rm -f "$2"
+	touch "$2"
+	cat "$1" >"$2" || return 1
+	rm -f "$1"
+}
+
 clean_pkg() {
 	local pkg
 	local target
@@ -12,9 +21,9 @@ clean_pkg() {
 			if [ -h "$pkg" ]; then
 				rm -f "$pkg" "$pkg.sig"
 			else
-				mv -f "$pkg" "$CLEANUP_DESTDIR"
+				mv_acl "$pkg" "$CLEANUP_DESTDIR/${pkg##*/}"
 				if [ -e "$pkg.sig" ]; then
-					mv -f "$pkg.sig" "$CLEANUP_DESTDIR"
+					mv_acl "$pkg.sig" "$CLEANUP_DESTDIR/${pkg##*/}.sig"
 				fi
 				touch "${CLEANUP_DESTDIR}/${pkg##*/}"
 			fi
-- 
cgit v1.2.3-54-g00ecf


From fbce7db101feaba0d69bf185b54270c1aa6d65ab Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 19 Mar 2013 19:53:38 +0100
Subject: sourceballs: fix ACL issues on nymeria

ACLs from the WORKDIR were used, leading to problems as these weren't
world-readable. Fix follows ftpdir-cleanup.

Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 cron-jobs/ftpdir-cleanup | 9 ---------
 cron-jobs/sourceballs    | 4 ++--
 db-functions             | 9 +++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'cron-jobs/ftpdir-cleanup')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index e1294bd..8f5cb3c 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -3,15 +3,6 @@
 . "$(dirname $0)/../config"
 . "$(dirname $0)/../db-functions"
 
-# just like mv -f, but we touch the file and then copy the content so
-# default ACLs in the target dir will be applied
-mv_acl() {
-	rm -f "$2"
-	touch "$2"
-	cat "$1" >"$2" || return 1
-	rm -f "$1"
-}
-
 clean_pkg() {
 	local pkg
 	local target
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 6f75ccc..be66e99 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -90,7 +90,7 @@ for repo in ${PKGREPOS[@]}; do
 			pushd "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
 			makepkg --nocolor --allsource --ignorearch --skippgpcheck --config "${dirname}/makepkg.conf" >"${WORKDIR}/${pkgbase}.log" 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${SRCEXT}" ]; then
-				mv "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}"
+				mv_acl "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}/${pkgbase}-${pkgver}${SRCEXT}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${SRCEXT}" >> "${WORKDIR}/available-src-pkgs"
 				newpkgs[${#newpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
@@ -127,7 +127,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	for old_pkg in ${old_pkgs[@]}; do
 		msg2 "${old_pkg}"
 		if ! ${SOURCE_CLEANUP_DRYRUN}; then
-			mv "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
+			mv_acl "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 		fi
 	done
diff --git a/db-functions b/db-functions
index b3a4293..4a9a42a 100644
--- a/db-functions
+++ b/db-functions
@@ -15,6 +15,15 @@ restore_umask () {
 	umask $UMASK >/dev/null
 }
 
+# just like mv -f, but we touch the file and then copy the content so
+# default ACLs in the target dir will be applied
+mv_acl() {
+	rm -f "$2"
+	touch "$2"
+	cat "$1" >"$2" || return 1
+	rm -f "$1"
+}
+
 # set up general environment
 WORKDIR=$(mktemp -d "${TMPDIR}/${0##*/}.XXXXXXXXXX")
 if [ -n "${SVNUSER}" ]; then
-- 
cgit v1.2.3-54-g00ecf


From e6294556d3197b7d87f7659355d0e189fad613d6 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 8 Dec 2013 17:33:25 -0500
Subject: `readlink -e` all "$0"s

---
 cron-jobs/ftpdir-cleanup | 4 ++--
 cron-jobs/sourceballs    | 2 +-
 cron-jobs/update-web-db  | 4 ++--
 db-move                  | 4 ++--
 db-remove                | 4 ++--
 db-repo-add              | 4 ++--
 db-repo-remove           | 4 ++--
 db-update                | 4 ++--
 testing2x                | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'cron-jobs/ftpdir-cleanup')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 8f5cb3c..e42a1a8 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../config"
-. "$(dirname $0)/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 clean_pkg() {
 	local pkg
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 103898d..2362024 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dirname="$(dirname $(readlink -e $0))"
+dirname="$(dirname "$(readlink -e "$0")")"
 . "${dirname}/../config"
 . "${dirname}/../db-functions"
 pushd "${WORKDIR}" >/dev/null
diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db
index 195d1fc..713e75e 100755
--- a/cron-jobs/update-web-db
+++ b/cron-jobs/update-web-db
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../config"
-. "$(dirname $0)/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # setup paths
 SPATH="/srv/http/archweb"
diff --git a/db-move b/db-move
index 6e8796d..1b34404 100755
--- a/db-move
+++ b/db-move
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/config"
-. "$(dirname $0)/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$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 ccab5ea..993574f 100755
--- a/db-remove
+++ b/db-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/config"
-. "$(dirname $0)/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$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 5d5b653..a6355a1 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/config"
-. "$(dirname $0)/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: ${0##*/} <repo> <arch> <pkgfile> ..."
diff --git a/db-repo-remove b/db-repo-remove
index 2a693f4..7077d62 100755
--- a/db-repo-remove
+++ b/db-repo-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/config"
-. "$(dirname $0)/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: ${0##*/} <repo> <arch> <pkgname> ..."
diff --git a/db-update b/db-update
index 28fcabe..9c6a56a 100755
--- a/db-update
+++ b/db-update
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/config"
-. "$(dirname $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 no longer supported"
diff --git a/testing2x b/testing2x
index d93c5f8..14610c2 100755
--- a/testing2x
+++ b/testing2x
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/config"
-. "$(dirname $0)/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 1 ]; then
 	msg "usage: ${0##*/} <pkgname|pkgbase> ..."
-- 
cgit v1.2.3-54-g00ecf