From 9454e6c20dc722aa65dbdc9a1c4a5ba65bac4f8e Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 6 Mar 2014 23:18:22 +0100
Subject: initial work to support new dbscripts

still buggy and missing features, but I don't know which. forgot to
commit this earlier...

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 commitpkg.in | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'commitpkg.in')

diff --git a/commitpkg.in b/commitpkg.in
index 1095006..237e5db 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -163,7 +163,7 @@ for _arch in ${arch[@]}; do
 done
 
 if [[ ${#commit_arches[*]} -gt 0 ]]; then
-	archrelease "${archreleaseopts[@]}" "${commit_arches[@]/#/$repo-}" || die
+	archrelease || die
 fi
 
 if [[ ${#uploads[*]} -gt 0 ]]; then
@@ -178,25 +178,16 @@ if [[ ${#uploads[*]} -gt 0 ]]; then
 	unset new_uploads
 	msg 'Uploading all package and signature files'
 	rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die
-fi
 
-if [[ "${arch[*]}" == 'any' ]]; then
-	if [[ -d ../repos/$repo-i686 && -d ../repos/$repo-x86_64 ]]; then
-		pushd ../repos/ >/dev/null
-		stat_busy "Removing $repo-i686 and $repo-x86_64"
-		svn rm -q $repo-i686
-		svn rm -q $repo-x86_64
-		svn commit -q -m "Removed $repo-i686 and $repo-x86_64 for $pkgname"
-		stat_done
-		popd >/dev/null
-	fi
-else
-	if [[ -d ../repos/$repo-any ]]; then
-		pushd ../repos/ >/dev/null
-		stat_busy "Removing $repo-any"
-		svn rm -q $repo-any
-		svn commit -q -m "Removed $repo-any for $pkgname"
-		stat_done
-		popd >/dev/null
-	fi
+	for _upload in "${uploads[@]}"; do
+		local pkgfile=${upload##*/}
+
+		# TODO: logic to determine which package to add to which arches
+		if [[ $pkgfile = *.pkg.tar?(.?z) ]]; then
+			for _arch in "${commit_arches[@]}"; do
+				ssh "$server" ln -sr "staging/$repo/$pkgfile" "staging/$repo/$arch/$pkgfile"
+			done
+		fi
+	done
 fi
+
-- 
cgit v1.2.3-24-g4f1b