Local changes

4 files changed, 43 insertions, 12 deletions

diff --git a/config b/config
index 0e8dc2e..0e26efb 100644
--- a/config
+++ b/config
@@ -1,27 +1,27 @@
 #!/bin/bash
-FTP_BASE="/home/parabolavnx/parabolagnulinux.org/repo"
-ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo"
-SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre"
+FTP_BASE="/srv/http/repo/public"
+ARCH_BASE="/srv/http/repo/public"
+SVNREPO="/srv/http/repo/abslibre"
 
 # Repos from Arch
 ARCHREPOS=('core' 'extra' 'community'  'testing' 'multilib')
 # Official Parabola repos
 OURREPOS=('libre' 'libre-testing')
 # User repos
-USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm')
+USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan')
 # Community project repos
-PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'social')
+PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar')
 PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]})
 PKGPOOL='pool/packages'
 SRCPOOL='sources/packages'
 
 CLEANUP_DESTDIR="$FTP_BASE/old/packages"
-CLEANUP_DRYRUN=false
+CLEANUP_DRYRUN=true
 # Time in days to keep moved packages
 CLEANUP_KEEP=30
 
 SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/sources"
-SOURCE_CLEANUP_DRYRUN=false
+SOURCE_CLEANUP_DRYRUN=true
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP=30
 
@@ -31,13 +31,14 @@ LOCK_DELAY=10
 LOCK_TIMEOUT=300
 
 STAGING="$FTP_BASE/staging"
-TMPDIR="$HOME/tmp"
+TMPDIR="/tmp"
 ARCHARCHES=(i686 x86_64)
-ARCHES=(${ARCHARCHES[@]} mips64el)
+OURARCHES=(mips64el)
+ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
 DBEXT=".db.tar.gz"
 FILESEXT=".files.tar.gz"
 PKGEXT=".pkg.tar.?z"
 SRCEXT=".src.tar.gz"
 
-MAKEPKGCONF="$HOME/etc/makepkg.conf"
+MAKEPKGCONF="~/.makepkg.conf"
 BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
diff --git a/migrate-repo b/migrate-repo
new file mode 100755
index 0000000..2e44adb
--- /dev/null
+++ b/migrate-repo
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+source $(dirname $0)/config
+
+#dryrun="--dry-run"
+
+# Sync our repos
+#for parabola_repo in ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}; do
+for parabola_repo in ${USERREPOS[@]} ${PROJREPOS[@]}; do
+        echo ":: Syncing ${parabola_repo}/ => ${FTP_BASE}/${parabola_repo}/"
+        rsync -avL ${dryrun} --progress -e ssh parabolavnx@69.163.153.218:repo/${parabola_repo}/ ${FTP_BASE}/${parabola_repo}/
+done
+
+# Sync our arches
+#for parabola_arch in ${OURARCHES[@]}; do
+#for arch_repo in ${ARCHREPOS[@]}; do
+        #echo ":: Syncing ${arch_repo}/os/${parabola_arch}/ => ${FTP_BASE}/${arch_repo}/os/${parabola_arch}/"
+#        rsync -avL ${dryrun} --progress -e ssh parabolavnx@69.163.153.218:repo/${arch_repo}/os/${parabola_arch}/ ${FTP_BASE}/${arch_repo}/os/${parabola_arch}/
+#done
+#done
+#
+# Sync other dirs last 
+#for other in screenshots isos; do
+for other in other; do
+        echo ":: Syncing ${other}/ => ${FTP_BASE}/${other}/"
+        rsync -avL ${dryrun} --progress -e ssh parabolavnx@69.163.153.218:repo/${other}/ ${FTP_BASE}/${other}
+done
+
+exit $?
diff --git a/repo-add b/repo-add
index c4bf96f..ef9c1e1 100755
--- a/repo-add
+++ b/repo-add
@@ -20,7 +20,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-LICENSESDIR=/home/parabolavnx/licenses
+LICENSESDIR=/srv/http/repo/licenses
 
 # gettext initialization
 export TEXTDOMAIN='pacman'
diff --git a/repo-update b/repo-update
index 4f31116..bf8d73c 100755
--- a/repo-update
+++ b/repo-update
@@ -22,7 +22,8 @@ for repo in ${ARCHREPOS[@]}; do
         # rsync_not_needed for using as an rsync exclude-from
         #find ${repodir}/${repo}/os/${arch}/ -name "*${PKGEXT}" \
         #    -fprintf ${rsync_not_needed}-${repo}-${arch} '%f\n' || exit 1
-        find ${repodir}/${PKGPOOL}/ -name "*${PKGEXT}" \
+        #find ${repodir}/${PKGPOOL}/ -name "*${PKGEXT}" \
+        find ${repodir}/${repo}/os/${arch}/ -name "*${PKGEXT}" \
             -fprintf ${rsync_not_needed}-${repo}-${arch} '%f\n' || exit 1
         # Actual rsync command
         ${rsync_update_command} \