From 23f27f85708e2aeaf1f9ea7f9e1a195766fe6736 Mon Sep 17 00:00:00 2001
From: John Hess <john@jthess.com>
Date: Tue, 18 Feb 2025 12:31:48 -0600
Subject: [PATCH] populate dummy usb-butter app store only after the site is
 built

---
 .gitlab-ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b737e05..84419d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,21 +43,21 @@ pages:
     # Now go build the site we actually want to deploy.
     # simulate the drive being inserted
     - mv simulated-usb-butter usb-butter
+    - "sed -i 's/^baseurl.*/baseurl: \"\\/butter-box-ui\"/' _config.yml"
+    - "sed -i 's/^usb_butter_url.*/usb_butter_url: \"\\/butter-box-ui\\/usb-butter\\/\"/' _config.yml"
+    - bundle exec jekyll build -d public
     # Get the latest build of the FDroid PWA for butter
     - curl https://likebutter.gitlab.io/fdroid-webdash-butter/public.zip -o fdroid-webdash-butter.zip
     - unzip fdroid-webdash-butter.zip
-    - mkdir -p usb-butter/appstore
-    - mv build/web/* usb-butter/appstore
+    - mkdir -p public/usb-butter/appstore
+    - mv build/web/* public/usb-butter/appstore
     - rm -rf build
     - rm -f fdroid-webdash-butter.zip
     # Get a sample app store, the same one we refer to in documentation
     - curl -L "https://www.dropbox.com/scl/fi/r6dpqa9ugli0v23ox3ho5/repo.zip?rlkey=oxc50ne9runw1bkb1fm3zy5r3&dl=1" -o repo.zip
     - unzip repo.zip
-    - mv repo usb-butter/appstore/fdroid
-    - rm -f repo.zip
-    - "sed -i 's/^baseurl.*/baseurl: \"\\/butter-box-ui\"/' _config.yml"
-    - "sed -i 's/^usb_butter_url.*/usb_butter_url: \"\\/butter-box-ui\\/usb-butter\\/\"/' _config.yml"
-    - bundle exec jekyll build -d public
+    - mv repo public/usb-butter/appstore/fdroid
+    - rm -f repo.zip    
     # Now move the zip into the public dir so it gets served.
     - mv ./site-en.zip ./public/site-en.zip
     - mv ./site-es.zip ./public/site-es.zip