Use db-functions file everywhere

This source the config file and gets us functions such as
getpkgname which were duplicated elsewhere

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

4 files changed, 3 insertions, 27 deletions

diff --git a/cron-jobs/createFileLists b/cron-jobs/createFileLists
index 4ad4c22..345f9aa 100755
--- a/cron-jobs/createFileLists
+++ b/cron-jobs/createFileLists
@@ -4,7 +4,7 @@ reposdir=/srv/ftp/
 targetdir=$reposdir
 repos="core extra testing community"
 
-. $(dirname $0)/../config
+. "$(dirname $0)/../db-functions"
 
 if [ -f "/tmp/createFileList.lock" ]; then
     echo "Error: createFileList allready in progress."
@@ -18,17 +18,6 @@ CACHEDIR=$(mktemp -d /tmp/createFileList.XXXXXX) || exit 1
 #adjust the nice level to run at a lower priority
 /usr/bin/renice +10 -p $$ > /dev/null
 
-getpkgname() {
-    local tmp
-
-    tmp=${1##*/}
-    tmp=${tmp%$PKGEXT}
-    tmp=${tmp%-i686}
-    tmp=${tmp%-x86_64}
-    tmp=${tmp%-any}
-    echo $tmp
-}
-
 case "${DBEXT}" in
 	*.gz)  TAR_OPT="z" ;;
 	*.bz2) TAR_OPT="j" ;;
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 1a9fd98..04caf93 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -28,7 +28,7 @@ trap ctrl_c 2
 /usr/bin/renice +10 -p $$ > /dev/null
 
 #Get our destination dir
-. $(dirname $0)/../config
+. "$(dirname $0)/../db-functions"
 
 for repo in $repos; do
     $(dirname $0)/../misc-scripts/ftpdir-cleanup $repo $CLEANUP_DESTDIR
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index a34ae2d..02ebc66 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -4,7 +4,7 @@ ftpbase="/srv/ftp"
 srcbase="/srv/ftp/sources"
 repos="core extra testing community"
 
-. $(dirname $0)/../config
+. "$(dirname $0)/../db-functions"
 
 LOCKFILE="/tmp/.sourceball.lock"
 
@@ -30,18 +30,6 @@ trap ctrl_c 2
 
 dirname="$(/bin/readlink -f $(/usr/bin/dirname $0))"
 
-getpkgname() {
-	local tmp
-
-	tmp=${1##*/}
-	tmp=${tmp%$PKGEXT}
-    for a in ${ARCHES[@]}; do
-        tmp=${tmp%-$a}
-    done
-	echo ${tmp%-*-*}
-}
-
-
 FAILED_PKGS=""
 
 [ -e "$srcbase/errors.txt" ] && /bin/mv "$srcbase/errors.txt" "$srcbase/errors.txt.old"
diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball
index bd27e86..f93ab2a 100755
--- a/misc-scripts/make-sourceball
+++ b/misc-scripts/make-sourceball
@@ -9,7 +9,6 @@ if [ $# -ne 3 -a $# -ne 4 ]; then
     exit 1
 fi
 
-. "$(dirname $0)/../config"
 . "$(dirname $0)/../db-functions"
 
 FORCE=0