fix deploying badge/ and old forums/ archive

f-droid · Oct 16, 2017 · 054a216 · 054a216
1 parent bb781e1
commit 054a216
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.rsync-deploy-exclude-list b/.rsync-deploy-exclude-list
@@ -1,4 +1,3 @@
 /archive
-/forums
 /repo
 /wiki
diff --git a/tools/deploy-external-assets.sh b/tools/deploy-external-assets.sh
@@ -11,17 +11,19 @@ fi
 OUTPUT_DIR=$1
 
 echo "Deploying the /badge/ directory..."
-BADGE_DIR=${OUTPUT_DIR}/badge
-curl https://gitlab.com/fdroid/artwork/repository/archive.tar.gz?ref=master | gunzip -c | tar --wildcards -xf - 'artwork-master*/badge'
-rm -rf ${BADGE_DIR}
-mv artwork-master-*/badge ${BADGE_DIR}
+curl https://gitlab.com/fdroid/artwork/repository/archive.tar.gz?ref=master \
+ | gunzip -c \
+ | tar --wildcards -xf - 'artwork-master*/badge'
+rm -rf ${OUTPUT_DIR}/badge
+mv artwork-master-*/badge ${OUTPUT_DIR}/
 rm -r artwork-master-*
 
 echo "Deploying the /forums/ directory..."
-FORUMS_DIR=${OUTPUT_DIR}/forums
-curl https://gitlab.com/fdroid/fdroid-website-legacy-forum/repository/archive.tar.gz?ref=master | gunzip -c | tar --wildcards -xf - 'fdroid-website-legacy-forum-master*/forums'
-rm -rf ${FORUMS_DIR}
-mv fdroid-website-legacy-forum-master-*/forums ${FORUMS_DIR}
+curl https://gitlab.com/fdroid/fdroid-website-legacy-forum/repository/archive.tar.gz?ref=master \
+ | gunzip -c \
+ | tar --wildcards -xf - 'fdroid-website-legacy-forum-master*/forums'
+rm -rf ${OUTPUT_DIR}/forums
+mv fdroid-website-legacy-forum-master-*/forums ${OUTPUT_DIR}/
 rm -r fdroid-website-legacy-forum-master*
 
 echo "Deploying download button symlinks..."