Merge branch 'cleanup' into master-merge

Conflicts:
	config
	cron-jobs/sourceballs
	db-functions
	db-move
	db-remove
	db-update

1 files changed, 3 insertions, 3 deletions

diff --git a/config b/config
index 8b8117f..496b3ef 100644
--- a/config
+++ b/config
@@ -1,4 +1,4 @@
-#!/bin/bash
+#/bin/bash # as a hint to text editors
 FTP_BASE="/srv/http/repo/public"
 ARCH_BASE="/srv/http/repo/public"
 SVNREPO="/var/abs"
@@ -12,7 +12,7 @@ USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jor
 # Community project repos
 PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism')
 # Remote repos
-PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]})
+PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
 PKGPOOL='pool/packages'
 SRCPOOL='sources/packages'
 
@@ -37,7 +37,7 @@ REQUIRE_SIGNATURE=true
 LOCK_DELAY=10
 LOCK_TIMEOUT=300
 
-[ -n "${STAGING:-}" ] || STAGING="$FTP_BASE/staging"
+[ -n "${STAGING:-}" ] || STAGING="$HOME/staging"
 TMPDIR="/tmp"
 ARCHARCHES=(i686 x86_64)
 OURARCHES=(mips64el)