trivial: Move the helpers into a new directory

5 files changed, 21 insertions, 12 deletions

diff --git a/contrib/.gitignore b/contrib/.gitignore
new file mode 100644
index 0000000..503f3af
--- /dev/null
+++ b/contrib/.gitignore
@@ -0,0 +1,5 @@
+helpers
+logs
+metadata
+packages
+screenshots
diff --git a/contrib/fedora-20-gnome-3-12.sh b/contrib/helpers/fedora-20-gnome-3-12.sh
index b7a35d6..cdc28a0 100755
--- a/contrib/fedora-20-gnome-3-12.sh
+++ b/contrib/helpers/fedora-20-gnome-3-12.sh
@@ -1,12 +1,13 @@
 time client/appstream-builder						\
 	--api-version=0.41						\
-	--log-dir=./contrib/fedora-20-gnome-3-12/logs			\
-	--temp-dir=./tmp/f20-gnome-3-12					\
+	--log-dir=./contrib/logs/fedora-20-gnome-3-12			\
+	--temp-dir=./tmp/fedora-20-gnome-3-12				\
 	--cache-dir=./contrib/cache					\
-	--packages-dir=../fedora-appstream/fedora-20-gnome-3-12/packages/ \
+	--packages-dir=./contrib/packages/fedora-20-gnome-3-12/packages/ \
 	--extra-appstream-dir=../fedora-appstream/appstream-extra	\
 	--extra-appdata-dir=../fedora-appstream/appdata-extra		\
 	--extra-screenshots-dir=../fedora-appstream/screenshots-extra	\
-	--output-dir=./contrib/f20-gnome-3-12				\
+	--output-dir=./contrib/metadata					\
+	--screenshot-dir=./contrib/screenshots/fedora-20-gnome-3-12	\
 	--basename=fedora-20-gnome-3-12					\
 	--screenshot-uri=http://alt.fedoraproject.org/pub/alt/screenshots/f20/
diff --git a/contrib/fedora-20.sh b/contrib/helpers/fedora-20.sh
index 60f3e4e..21d4466 100755
--- a/contrib/fedora-20.sh
+++ b/contrib/helpers/fedora-20.sh
@@ -1,12 +1,13 @@
 time client/appstream-builder						\
 	--api-version=0.3						\
-	--log-dir=../createrepo_as_logs					\
+	--log-dir=./contrib/logs/fedora-20				\
 	--temp-dir=./tmp/fedora-20					\
 	--cache-dir=./contrib/cache					\
-	--packages-dir=../fedora-appstream/fedora-20/packages/		\
+	--packages-dir=./contrib/packages/fedora-20/packages/		\
 	--extra-appstream-dir=../fedora-appstream/appstream-extra	\
 	--extra-appdata-dir=../fedora-appstream/appdata-extra		\
 	--extra-screenshots-dir=../fedora-appstream/screenshots-extra	\
-	--output-dir=./contrib/f20					\
+	--output-dir=./contrib/metadata					\
+	--screenshot-dir=./contrib/screenshots/fedora-20		\
 	--basename=fedora-20						\
 	--screenshot-uri=http://alt.fedoraproject.org/pub/alt/screenshots/f20/
diff --git a/contrib/fedora-rawhide.sh b/contrib/helpers/fedora-rawhide.sh
index 151cf41..d252360 100755
--- a/contrib/fedora-rawhide.sh
+++ b/contrib/helpers/fedora-rawhide.sh
@@ -1,12 +1,13 @@
 time client/appstream-builder						\
 	--api-version=0.7						\
 	--log-dir=../createrepo_as_logs					\
-	--temp-dir=./tmp/fedora-rawhide					\
+	--temp-dir=./tmp/fedora-21					\
 	--cache-dir=./contrib/cache					\
-	--packages-dir=../fedora-appstream/fedora-rawhide/packages/	\
+	--packages-dir=./contrib/packages/fedora-rawhide/packages/	\
 	--extra-appstream-dir=../fedora-appstream/appstream-extra	\
 	--extra-appdata-dir=../fedora-appstream/appdata-extra		\
 	--extra-screenshots-dir=../fedora-appstream/screenshots-extra	\
-	--output-dir=./contrib/f21					\
+	--output-dir=./contrib/metadata					\
+	--screenshot-dir=./contrib/screenshots/fedora-21		\
 	--basename=fedora-21						\
 	--screenshot-uri=http://alt.fedoraproject.org/pub/alt/screenshots/f21/
diff --git a/contrib/ubuntu-utopic.sh b/contrib/helpers/ubuntu-utopic.sh
index 800a159..fe359b8 100755
--- a/contrib/ubuntu-utopic.sh
+++ b/contrib/helpers/ubuntu-utopic.sh
@@ -1,9 +1,10 @@
 time client/appstream-builder						\
 	--api-version=0.7						\
-	--log-dir=./contrib/logs-ubu					\
+	--log-dir=./contrib/logs/ubuntu-utopic				\
 	--temp-dir=./contrib/tmp-ubu					\
 	--cache-dir=./contrib/cache-ubu					\
 	--packages-dir=/media/raid/Archive/Ubuntu/			\
 	--extra-appdata-dir=../fedora-appstream/appdata-extra		\
-	--output-dir=./contrib/ubu					\
+	--output-dir=./contrib/metadata					\
+	--screenshot-dir=./contrib/screenshots/ubuntu-utopic		\
 	--basename=ubuntu-utopic