Switch to proper script usage

Switch to a callable script in place of an include file

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

9 files changed, 16 insertions, 40 deletions

diff --git a/db-core b/db-core
index ccbfb61..f14bfab 100755
--- a/db-core
+++ b/db-core
@@ -1,7 +1,3 @@
 #!/bin/bash
 
-repoid=5
-reponame="core"
-arch="i686"
-
-. $(dirname $0)/db-inc
+$(dirname $0)/db-update "i686" "core"
diff --git a/db-core64 b/db-core64
index d15be60..f14bfab 100755
--- a/db-core64
+++ b/db-core64
@@ -1,7 +1,3 @@
 #!/bin/bash
 
-repoid=5
-reponame="core"
-arch="x86_64"
-
-. $(dirname $0)/db-inc
+$(dirname $0)/db-update "i686" "core"
diff --git a/db-extra b/db-extra
index 8d2c5b8..99c7b8f 100755
--- a/db-extra
+++ b/db-extra
@@ -1,7 +1,3 @@
 #!/bin/bash
 
-repoid=2
-reponame="extra"
-arch="i686"
-
-. $(dirname $0)/db-inc
+$(dirname $0)/db-update "i686" "extra"
diff --git a/db-extra64 b/db-extra64
index 19eef9f..5c183e9 100755
--- a/db-extra64
+++ b/db-extra64
@@ -1,7 +1,3 @@
 #!/bin/bash
 
-repoid=2
-reponame="extra"
-arch="x86_64"
-
-. $(dirname $0)/db-inc
+$(dirname $0)/db-update "x86_64" "extra"
diff --git a/db-testing b/db-testing
index 15205a2..e2fe01d 100755
--- a/db-testing
+++ b/db-testing
@@ -1,7 +1,3 @@
 #!/bin/bash
 
-repoid=4
-reponame="testing"
-arch="i686"
-
-. $(dirname $0)/db-inc
+$(dirname $0)/db-update "i686" "testing"
diff --git a/db-testing64 b/db-testing64
index c34355b..244372b 100755
--- a/db-testing64
+++ b/db-testing64
@@ -1,7 +1,3 @@
 #!/bin/bash
 
-repoid=4
-reponame="testing"
-arch="x86_64"
-
-. $(dirname $0)/db-inc
+$(dirname $0)/db-update "x86_64" "testing"
diff --git a/db-unstable b/db-unstable
index b0231b4..a9aa49c 100755
--- a/db-unstable
+++ b/db-unstable
@@ -1,8 +1,4 @@
 #!/bin/bash
 
-repoid=3
-reponame="unstable"
-arch="i686"
-
-. $(dirname $0)/db-inc
+$(dirname $0)/db-update "i686" "unstable"
 
diff --git a/db-unstable64 b/db-unstable64
index 225cf97..d9448ab 100755
--- a/db-unstable64
+++ b/db-unstable64
@@ -1,8 +1,4 @@
 #!/bin/bash
 
-repoid=3
-reponame="unstable"
-arch="x86_64"
-
-. $(dirname $0)/db-inc
+$(dirname $0)/db-update "x86_64" "unstable"
 
diff --git a/db-inc b/db-update
index 3f0e286..24ca489 100644
--- a/db-inc
+++ b/db-update
@@ -3,8 +3,16 @@
 # where are the arch scripts located?
 ARCHDIR="/arch"
 
+if [ $# -ne 2 ]; then
+	echo "usage: $(basename $0) <arch> <repo>"
+	exit 1
+fi
+
 #All this fun stuff used to be in the db-(whatever) files
 # Let's make it cleaner
+arch="$1"
+reponame="$2"
+
 export CARCH="$arch"
 ftppath="/home/ftp/$reponame/os/$arch/"
 svnpath="/home/svn-packages"