Use more consitent naming for package pool

There are no longer architecture-specific subdirs and the structure was switch to this:

ftp
└── pool
    ├── community
    └── packages

packages contains all packages from core, extra and testing; this naming is in sync with the svn repo naming:
svn-packages and svn-community

2 files changed, 13 insertions, 15 deletions

diff --git a/cron-jobs/adjust-permissions b/cron-jobs/adjust-permissions
index c21af0c..c28ca7c 100755
--- a/cron-jobs/adjust-permissions
+++ b/cron-jobs/adjust-permissions
@@ -17,9 +17,9 @@ get_dir_owner() {
 			echo "root:tusers" ;;
 		community-testing)
 			echo "root:tusers" ;;
-		packages/arch)
+		pool/packages)
 			echo "ftp:ftp-extra" ;;
-		packages/community)
+		pool/community)
 			echo "root:tusers" ;;
 	esac
 }
@@ -35,8 +35,8 @@ for d in $(get_repos_for_host); do
 done
 for p in $(get_pkgpool_for_host); do
 	owner="$(get_dir_owner $p)"
-	/bin/chown -R $owner $p/{any,i686,x86_64}
-	/bin/chmod -R g+w $p/{any,i686,x86_64}
+	/bin/chown $owner $p
+	/bin/chmod g+w $p
 done
 /bin/chmod 555 $FTP_BASE
 popd >/dev/null
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index f5e401a..7668ab5 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -17,18 +17,16 @@ for repo in $repos; do
 done
 
 to_cleanup=""
-for _arch in any ${ARCHES[@]}; do
-    poolpath="$FTP_BASE/$(get_pkgpool_for_host)/$_arch/"
-    pushd $poolpath >/dev/null
-    for pkg in *$PKGEXT; do
-        [ -f "$pkg" ] || continue # in case we get a file named "*.pkg.tar.gz"
-        LINKS="$(/usr/bin/find $repopaths -type l -name "$pkg" 2>/dev/null)"
-        if [ -z "$LINKS" ]; then
-            to_cleanup="$to_cleanup $poolpath/$pkg"
-        fi
-    done
-    popd >/dev/null
+poolpath="$FTP_BASE/$(get_pkgpool_for_host)/"
+pushd $poolpath >/dev/null
+for pkg in *$PKGEXT; do
+[ -f "$pkg" ] || continue # in case we get a file named "*.pkg.tar.gz"
+LINKS="$(/usr/bin/find $repopaths -type l -name "$pkg" 2>/dev/null)"
+if [ -z "$LINKS" ]; then
+	to_cleanup="$to_cleanup $poolpath/$pkg"
+fi
 done
+popd >/dev/null
 
 if [ -n "$to_cleanup" ]; then
     echo "    The following packages are no longer in any repo"