fix things

2 files changed, 16 insertions, 7 deletions

diff --git a/db-remove b/db-remove
index a71bbab..f0785e5 100755
--- a/db-remove
+++ b/db-remove
@@ -33,7 +33,7 @@ for pkgbase in ${pkgbases[@]}; do
     if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
         remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo ${pkgname[@]}))
 	else
-		warning "$pkgbase not found in $svnrepo"
+		warning "$pkgbase not found in ABS(libre)"
 		warning "Removing only $pkgbase from the repo"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs[${#remove_pkgs[*]}]=$pkgbase
diff --git a/db-update b/db-update
index 2fa23af..2d4f28a 100755
--- a/db-update
+++ b/db-update
@@ -9,7 +9,7 @@ if [ $# -ge 1 ]; then
 fi
 
 # Find repos with packages to release
-repos=($(find  "${STAGING}" -mindepth 1 -maxdepth 1 -type d ! -empty -printf '%f ' 2>/dev/null))
+repos=($(find  "${STAGING}" -mindepth 1 -maxdepth 1 -type d ! -empty ! -name other -printf '%f ' 2>/dev/null))
 if [ $? -ge 1 ]; then
 	die "Could not read ${STAGING}"
 fi
@@ -39,10 +39,10 @@ for repo in ${repos[@]}; do
 				die "Package ${repo}/$(basename ${pkg}) already exists in another repository"
 			fi
 		done
-        # This is fucking obnoxious
-#		if ! check_splitpkgs ${repo} ${pkgs[@]}; then
-#			die "Missing split packages for ${repo}"
-#		fi
+		# This is fucking obnoxious
+		#if ! check_splitpkgs ${repo} ${pkgs[@]}; then
+		#	die "Missing split packages for ${repo}"
+		#fi
 	else
 		die "Could not read ${STAGING}"
 	fi
@@ -83,4 +83,13 @@ for repo in ${repos[@]}; do
 	done
 done
 
-cp -rviT "${STAGING}/other/" "${FTP_BASE}/other/"
+cd "${STAGING}"
+while read -r file; do
+	pub="${FTP_BASE}/${file}"
+	if [[ -f $pub ]]; then
+		warning "file already exists: %s" "${file}"
+	else
+		mkdir -p -- "${pub%/*}"
+		mv -vn "$file" "$pub"
+	fi
+done < <(find other -type f)