Merge branch 'master' into lukeshu/xbs

Conflicts:
	cron-jobs/update-web-db

1 files changed, 0 insertions, 29 deletions

diff --git a/migrate-repo b/migrate-repo
deleted file mode 100755
index 751d5bd..0000000
--- a/migrate-repo
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-source "$(dirname "$(readlink -e "$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 $?