updated scripts for new ftp paths, moved over to pkgdb1/pkgdb2

5 files changed, 26 insertions, 20 deletions

diff --git a/db-arch b/db-arch
index 3dbd3dc..7abc604 100755
--- a/db-arch
+++ b/db-arch
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: db-arch,v 1.17 2004/07/01 19:41:21 judd Exp $
+# $Id: db-arch,v 1.18 2004/07/03 20:28:11 judd Exp $
 
 uid=`id -u`
 repoid=1
@@ -43,8 +43,8 @@ if [ -d /tmp/.gensync ]; then
 	echo "error: someone else is currently running gensync!"
 	exit 1
 fi
-/usr/bin/gensync $TMPDIR/arch/build $TMPDIR/current.db.tar.gz /home/ftp/current
-[ -f $TMPDIR/current.db.tar.gz ] && mv -f $TMPDIR/current.db.tar.gz /home/ftp/current
+/usr/bin/gensync $TMPDIR/arch/build $TMPDIR/current.db.tar.gz /home/ftp/current/os/i686
+[ -f $TMPDIR/current.db.tar.gz ] && mv -f $TMPDIR/current.db.tar.gz /home/ftp/current/os/i686
 
 echo "==> Scanning for New/Updated/Deleted packages..." >&2
 cd $TMPDIR/arch/build
@@ -52,6 +52,6 @@ cd $TMPDIR/arch/build
 
 echo "==> Generating Text Package List..." >&2
 /arch/genpkglist current
-mv packages.txt /home/ftp/current/setup/packages.txt
+mv packages.txt /home/ftp/current/os/i686/setup/packages.txt
 
 cleanup
diff --git a/db-extra b/db-extra
index 204366f..689ac3f 100755
--- a/db-extra
+++ b/db-extra
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: db-extra,v 1.5 2004/04/01 21:09:13 judd Exp $
+# $Id: db-extra,v 1.6 2004/07/03 20:28:11 judd Exp $
 
 uid=`id -u`
 repoid=2
@@ -43,10 +43,12 @@ if [ -d /tmp/.gensync ]; then
 	echo "error: someone else is currently running gensync!"
 	exit 1
 fi
-/usr/bin/gensync $TMPDIR/extra $TMPDIR/extra.db.tar.gz /home/ftp/extra
-[ -f $TMPDIR/extra.db.tar.gz ] && mv -f $TMPDIR/extra.db.tar.gz /home/ftp/extra
+/usr/bin/gensync $TMPDIR/extra $TMPDIR/extra.db.tar.gz /home/ftp/extra/os/i686
+[ -f $TMPDIR/extra.db.tar.gz ] && mv -f $TMPDIR/extra.db.tar.gz /home/ftp/extra/os/i686
 
-cd $TMPDIR/extra && /arch/pkgdb $repoid
+echo "==> Scanning for New/Updated/Deleted packages..." >&2
+cd $TMPDIR/extra
+/arch/pkgdb1 $repoid | /arch/pkgdb2 $repoid
 
 echo "==> Scanning for missing packages..." >&2
 /arch/genpkglist extra
diff --git a/db-testing b/db-testing
index ab4850d..d0991a7 100755
--- a/db-testing
+++ b/db-testing
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: db-testing,v 1.5 2004/04/16 18:15:38 judd Exp $
+# $Id: db-testing,v 1.6 2004/07/03 20:28:11 judd Exp $
 
 uid=`id -u`
 repoid=4
@@ -51,10 +51,12 @@ if [ -d /tmp/.gensync ]; then
 	echo "error: someone else is currently running gensync!"
 	exit 1
 fi
-/usr/bin/gensync $TMPDIR $TMPDIR/testing.db.tar.gz /home/ftp/testing
-[ -f $TMPDIR/testing.db.tar.gz ] && mv -f $TMPDIR/testing.db.tar.gz /home/ftp/testing
+/usr/bin/gensync $TMPDIR $TMPDIR/testing.db.tar.gz /home/ftp/testing/os/i686
+[ -f $TMPDIR/testing.db.tar.gz ] && mv -f $TMPDIR/testing.db.tar.gz /home/ftp/testing/os/i686
 
-cd $TMPDIR && /arch/pkgdb $repoid
+echo "==> Scanning for New/Updated/Deleted packages..." >&2
+cd $TMPDIR
+/arch/pkgdb1 $repoid | /arch/pkgdb2 $repoid
 
 echo "==> Generating Text Package List..." >&2
 /arch/genpkglist testing
diff --git a/db-unstable b/db-unstable
index 6e0efa5..0ab9983 100755
--- a/db-unstable
+++ b/db-unstable
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: db-unstable,v 1.10 2004/04/01 21:09:13 judd Exp $
+# $Id: db-unstable,v 1.11 2004/07/03 20:28:11 judd Exp $
 
 uid=`id -u`
 repoid=3
@@ -43,10 +43,12 @@ if [ -d /tmp/.gensync ]; then
 	echo "error: someone else is currently running gensync!"
 	exit 1
 fi
-/usr/bin/gensync $TMPDIR/unstable $TMPDIR/unstable.db.tar.gz /home/ftp/unstable
-[ -f $TMPDIR/unstable.db.tar.gz ] && mv -f $TMPDIR/unstable.db.tar.gz /home/ftp/unstable
+/usr/bin/gensync $TMPDIR/unstable $TMPDIR/unstable.db.tar.gz /home/ftp/unstable/os/i686
+[ -f $TMPDIR/unstable.db.tar.gz ] && mv -f $TMPDIR/unstable.db.tar.gz /home/ftp/unstable/os/i686
 
-cd $TMPDIR/unstable && /arch/pkgdb $repoid
+echo "==> Scanning for New/Updated/Deleted packages..." >&2
+cd $TMPDIR/unstable
+/arch/pkgdb1 $repoid | /arch/pkgdb2 $repoid
 
 echo "==> Scanning for missing packages..." >&2
 /arch/genpkglist unstable
diff --git a/genpkglist b/genpkglist
index b740a2c..ec50488 100755
--- a/genpkglist
+++ b/genpkglist
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: genpkglist,v 1.10 2004/03/17 18:14:15 judd Exp $
+# $Id: genpkglist,v 1.11 2004/07/03 20:28:11 judd Exp $
 
 #
 # genpkglist
@@ -18,7 +18,7 @@ for category in `find * -type d -maxdepth 0 | grep -v CVS`; do
 		cd $pkg
 		if [ -f PKGBUILD ]; then
 			. PKGBUILD
-			if [ -f /home/ftp/$repodir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz ]; then
+			if [ -f /home/ftp/$repodir/os/i686/$pkgname-$pkgver-$pkgrel.pkg.tar.gz ]; then
 				echo "$category/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" >>$pkgfile
 			else
 				echo "notice: Missing $pkgname-$pkgver-$pkgrel.pkg.tar.gz in ftp site" >&2
@@ -29,11 +29,11 @@ for category in `find * -type d -maxdepth 0 | grep -v CVS`; do
 	cd ..
 done
 
-DUPES=`ls -1 /home/ftp/$1 | rev | cut -d- -f 3- | rev | sort | uniq -c | egrep -v '^      1' | awk '{print $2}'`
+DUPES=`ls -1 /home/ftp/$1/os/i686 | rev | cut -d- -f 3- | rev | sort | uniq -c | egrep -v '^      1' | awk '{print $2}'`
 
 if [ -n "$DUPES" ]; then
    echo "Possible Dupes for $1 (please remove old versions)."
    echo "Date         Filename"
-   for dupe in $DUPES; do ls -l /home/ftp/$1/${dupe}* | awk '{print $6" "$7" "$8" "$9}'; done
+   for dupe in $DUPES; do ls -l /home/ftp/$1/os/i686/${dupe}* | awk '{print $6" "$7" "$8" "$9}'; done
 fi