From 6666d28f019b1b7ea38f9bf1f4371a87d42fb927 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Tue, 18 Aug 2009 16:01:54 -0700
Subject: More makepkg.conf removal - prefer toplevel config

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 misc-scripts/ftpdir-cleanup  | 7 -------
 misc-scripts/make-sourceball | 6 ++----
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'misc-scripts')

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
-- 
cgit v1.2.3-24-g4f1b