From 1e16e59a861c8359dffe0af5b8dd4d2922f4018e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 30 Sep 2013 13:09:10 -0400
Subject: librerelease: fix

---
 src/abslibre-tools/librerelease | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/abslibre-tools/librerelease')

diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index 3baa8ad..a204054 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -53,7 +53,7 @@ readonly rsync_flags=(
 # Functions ####################################################################
 
 list0_files() {
-	find -L "${WORKDIR}/staging" -type f -print0
+	find -L "${WORKDIR}/staging" -type f -print0 | xargs -0 realpath -z --relative-to="${WORKDIR}/staging"
 }
 
 # This function is taken almost verbatim from makepkg
@@ -117,7 +117,7 @@ clean_files() {
 	fi
 
 	msg "Removing files from local staging directory"
-	xargs -0 -a "$file_list" "${rmcmd[@]}"
+	cd "${WORKDIR}/staging" && xargs -0 -a "$file_list" "${rmcmd[@]}"
 }
 
 ################################################################################
@@ -224,8 +224,9 @@ release_packages() {
 
 	msg "%s to upload" "$(du -hc --files0-from="$file_list" | sed -n '$s/\t.*//p')"
 	msg "Uploading packages..."
+	xargs -0 -a "$file_list" dirname -z | ssh ${REPODEST%%:*} "$(printf 'mkdir -p -- %q && cd %q && xargs -0 mkdir -pv --' "${REPODEST#*:}" "${REPODEST#*:}")"
 	if ! rsync ${dryrun} "${rsync_flags[@]}" \
-		-0 --files-from="$file_list"
+		-0 --files-from="$file_list" \
 		${WORKDIR}/staging \
 		${REPODEST}/
 	then
-- 
cgit v1.2.2