More makepkg.conf removal - prefer toplevel config

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

4 files changed, 2 insertions, 24 deletions

diff --git a/cron-jobs/createFileLists b/cron-jobs/createFileLists
index 2e42e56..610f0e1 100755
--- a/cron-jobs/createFileLists
+++ b/cron-jobs/createFileLists
@@ -7,13 +7,6 @@ DB_COMPRESSION="gz"
 
 . $(dirname $0)/../config
 
-if [ -f /etc/makepkg.conf ]; then
-    . /etc/makepkg.conf
-else
-    echo "Error: /etc/makepkg.conf does not exist."
-    exit 1
-fi
-
 if [ -f "/tmp/createFileList.lock" ]; then
     echo "Error: createFileList allready in progress."
     exit 1
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 27976ca..a34ae2d 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -8,12 +8,6 @@ repos="core extra testing community"
 
 LOCKFILE="/tmp/.sourceball.lock"
 
-if [ ! -f /etc/makepkg.conf ]; then
-    echo "/etc/makepkg.conf not found! Aborting"
-    exit 1
-fi
-
-. /etc/makepkg.conf
 cleanup () {
 	rm -f "$LOCKFILE"
     exit 0
diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup
index a9865c6..f64acfa 100755
--- a/misc-scripts/ftpdir-cleanup
+++ b/misc-scripts/ftpdir-cleanup
@@ -18,13 +18,6 @@ fi
 
 . "$(dirname $0)/../config" 
 
-if [ ! -f /etc/makepkg.conf ]; then
-    echo "/etc/makepkg.conf not found! Aborting"
-    exit 1
-fi
-
-. /etc/makepkg.conf
-
 getpkgname() {
   local tmp
 
diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball
index b3bd3d4..bd27e86 100755
--- a/misc-scripts/make-sourceball
+++ b/misc-scripts/make-sourceball
@@ -9,10 +9,8 @@ if [ $# -ne 3 -a $# -ne 4 ]; then
     exit 1
 fi
 
-BASEDIR="$(dirname $0)/../"
-. "$BASEDIR/db-functions"
-
-source_makepkg
+. "$(dirname $0)/../config"
+. "$(dirname $0)/../db-functions"
 
 FORCE=0
 if [ "$1" = "-f" ]; then