summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2009-07-23 05:55:01 +0200
committerAaron Griffin <aaronmgriffin@gmail.com>2009-07-23 05:55:01 +0200
commit6ed6f4e6a482e913b01f5dc6d0b52575614742a7 (patch)
tree22394534cd5d87254f2685c0bc56b6e50620d627
parent94c1ba6eed3fbdda8be0b7c67257d30dcabfd5c6 (diff)
downloaddbscripts-6ed6f4e6a482e913b01f5dc6d0b52575614742a7.tar.gz
dbscripts-6ed6f4e6a482e913b01f5dc6d0b52575614742a7.tar.xz
Use the top level config file for cron-jobs
Source our config file, and use ARCHES from it Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xcron-jobs/createFileLists5
-rwxr-xr-xcron-jobs/sourceballs7
2 files changed, 7 insertions, 5 deletions
diff --git a/cron-jobs/createFileLists b/cron-jobs/createFileLists
index 10520af..61cbc21 100755
--- a/cron-jobs/createFileLists
+++ b/cron-jobs/createFileLists
@@ -3,7 +3,8 @@
reposdir=/srv/ftp/
targetdir=$reposdir
repos="core extra testing community"
-arches="i686 x86_64"
+
+. $(dirname $0)/../config
if [ -f /etc/makepkg.conf ]; then
. /etc/makepkg.conf
@@ -45,7 +46,7 @@ esac
cd $reposdir
for repo in $repos; do
REPO_DB_FILE=${repo}.files.tar.${DB_COMPRESSION}
- for arch in $arches; do
+ for arch in ${ARCHES[@]}; do
repodir=${repo}/os/${arch}/
cached="no"
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index d07c482..27976ca 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -3,7 +3,8 @@
ftpbase="/srv/ftp"
srcbase="/srv/ftp/sources"
repos="core extra testing community"
-arches="any i686 x86_64"
+
+. $(dirname $0)/../config
LOCKFILE="/tmp/.sourceball.lock"
@@ -40,7 +41,7 @@ getpkgname() {
tmp=${1##*/}
tmp=${tmp%$PKGEXT}
- for a in $arches; do
+ for a in ${ARCHES[@]}; do
tmp=${tmp%-$a}
done
echo ${tmp%-*-*}
@@ -53,7 +54,7 @@ FAILED_PKGS=""
echo "Errors occured during run:" > "$srcbase/errors.txt"
for repo in $repos; do
- for arch in $arches; do
+ for arch in ${ARCHES[@]}; do
export CARCH="$arch"
ftppath="$ftpbase/$repo/os/$arch"
if [ ! -d "$ftppath" ]; then