summaryrefslogtreecommitdiff
path: root/misc-scripts
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2009-08-18 16:01:54 -0700
committerAaron Griffin <aaronmgriffin@gmail.com>2009-08-18 16:01:54 -0700
commit6666d28f019b1b7ea38f9bf1f4371a87d42fb927 (patch)
tree67784597057f2271515e3e9dec4074d03bfb62c1 /misc-scripts
parent37c975929d6a60b21ff9741329bc72e9523f376c (diff)
More makepkg.conf removal - prefer toplevel config
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'misc-scripts')
-rwxr-xr-xmisc-scripts/ftpdir-cleanup7
-rwxr-xr-xmisc-scripts/make-sourceball6
2 files changed, 2 insertions, 11 deletions
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