Remove dependence on makepkg.conf

Removed the need for makepkg.conf
* Killed off CARCH
* Added PKGEXT to the config file
* Remove source_makepkg function
* Source config file where makepkg.conf was needed

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

7 files changed, 2 insertions, 27 deletions

diff --git a/config b/config
index 66ef7e8..c735a91 100644
--- a/config
+++ b/config
@@ -11,3 +11,4 @@ TMPDIR="/srv/tmp"
 ARCHES=(i686 x86_64)
 BUILDSCRIPT="PKGBUILD"
 DBEXT=".db.tar.gz"
+PKGEXT=".pkg.tar.gz"
diff --git a/convert-to-any b/convert-to-any
index 2ad1521..e21b7cd 100755
--- a/convert-to-any
+++ b/convert-to-any
@@ -15,12 +15,7 @@ if [ $# -ne 1 ]; then
     exit 1
 fi
 
-if [ -f /etc/makepkg.conf ]; then
-    . /etc/makepkg.conf
-else
-    echo "E: /etc/makepkg.conf does not exist."
-    exit 1
-fi
+. "$(dirname $0)/db-functions"
 
 cleanup() {
     trap '' 0 2
diff --git a/db-functions b/db-functions
index bbb6abc..ccab830 100644
--- a/db-functions
+++ b/db-functions
@@ -12,15 +12,6 @@ if [ -f "$BASEDIR/config" ]; then
 fi
 
 # Useful functions
-source_makepkg () {
-	if [ -f "/etc/makepkg.conf" ]; then
-		#Get some config info
-		. /etc/makepkg.conf
-	else
-		echo "error: /etc/makepkg.conf does not exist!"
-		exit 1
-	fi
-}
 
 UMASK=""
 set_umask () {
diff --git a/db-move b/db-move
index e1a50bd..de81e85 100755
--- a/db-move
+++ b/db-move
@@ -7,15 +7,11 @@ fi
 
 . "$(dirname $0)/db-functions"
 
-source_makepkg
-
 packagebase="$1"
 repofrom="$2"
 repoto="$3"
 _arch="$4"
 
-export CARCH="$_arch"
-
 ftppath_from="$FTP_BASE/$repofrom/os/"
 ftppath_to="$FTP_BASE/$repoto/os/"
 svnrepo_from="$repofrom-$_arch"
diff --git a/db-remove b/db-remove
index b4151c7..eae204e 100755
--- a/db-remove
+++ b/db-remove
@@ -7,14 +7,10 @@ fi
 
 . "$(dirname $0)/db-functions"
 
-source_makepkg
-
 packagebase="$1"
 reponame="$2"
 arch="$3"
 
-export CARCH="$arch"
-
 ftppath="$FTP_BASE/$reponame/os"
 svnrepo="$reponame-$arch"
 
diff --git a/db-update b/db-update
index 05236fe..7ff48ba 100755
--- a/db-update
+++ b/db-update
@@ -7,8 +7,6 @@ fi
 
 . "$(dirname $0)/db-functions"
 
-source_makepkg
-
 reponame="$1"
 current_arch=""
 
diff --git a/testing2x b/testing2x
index e116297..f3b256b 100755
--- a/testing2x
+++ b/testing2x
@@ -2,8 +2,6 @@
 
 . "$(dirname $0)/db-functions"
 
-source_makepkg
-
 case "$0" in
     *64)
     _arch="x86_64"