Merge branch 'repo'

4 files changed, 15 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index dd17455..98a5228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,9 @@
 *~
 *.pyc
-local_config
 /config.local
 test/packages/*/*.pkg.tar.?z
 \#*#
 .#*
 yftime
 src*
-pkg*
\ No newline at end of file
+pkg*
diff --git a/db-cleanup b/db-cleanup
index 904c06e..841800b 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -43,7 +43,7 @@ for _repo in ${PKGREPOS[@]}; do
         bsdtar tf "${dbfile}" | \
             cut -d'/' -f1 | \
             sort -u | \
-            sed "s|$|*|" >> /tmp/$0.$$.filter
+            sed "s|$|*|" >> /tmp/${0##*/}.$$.filter
 
     done
 done
@@ -54,7 +54,7 @@ for POOL in ${PKGPOOLS[@]} ${SRCPOOLS[@]}; do
     msg2 "${POOL}"
 
     rsync ${EXTRAFLAGS} -va --delete-excluded \
-          --include-from="/tmp/$0.$$.filter" \
+          --include-from="/tmp/${0##*/}.$$.filter" \
           --exclude="*" \
           ${FTP_BASE}/${POOL}/ \
           ${FTP_BASE}/${POOL}/
diff --git a/db-update b/db-update
index 0359697..2fa23af 100755
--- a/db-update
+++ b/db-update
@@ -83,4 +83,4 @@ for repo in ${repos[@]}; do
 	done
 done
 
-
+cp -rviT "${STAGING}/other/" "${FTP_BASE}/other/"
diff --git a/local_config.example b/local_config
index 2280cc2..8f3946a 100644
--- a/local_config.example
+++ b/local_config
@@ -1,13 +1,18 @@
 # Mirror options
-mirror="mirrors.eu.kernel.org"
-mirrorpath="mirrors/archlinux"
+#mirror="mirrors.uk2.net"
+mirror="mirrors.kernel.org"
+#mirror="mirror.umd.edu"
+#mirror="archlinux.c3sl.ufpr.br"
+#mirror="mirror.us.leaseweb.net"
+#mirror="mirror.de.leaseweb.net"
+mirrorpath="archlinux"
 
 # Directories: they should end without /
-paraboladir=~/parabolagnulinux.org
-tempdir=~/tmp
+paraboladir=/srv/http/repo/public
+tempdir=/tmp
 archdb=${tempdir}/db
 docs_dir=${paraboladir}/docs
-repodir=${paraboladir}/repo
+repodir=${paraboladir}
 licenses_dir=${docs_dir}/pending_licenses
 # End Directories
 
@@ -23,4 +28,4 @@ whitelist=${docs_dir}/whitelist.txt
 
 # Rsync commands
 rsync_list_command="rsync -rptgoL --exclude='*.abs.tar.*' --list-only --no-motd "
-rsync_update_command="rsync -rptgoL --exclude='*.abs.tar.*' --no-motd "
+rsync_update_command="rsync -vrptgoL --exclude='*.abs.tar.*' --no-motd "