From cb3726cd9cd7dfae8899809d265e948183bf279a Mon Sep 17 00:00:00 2001
From: BetTD <between13131@gmail.com>
Date: Sat, 4 Feb 2023 17:09:19 +0100
Subject: [PATCH] Fix my stupidity, also push non-manifested assets

---
 .github/workflows/deploy-s3.yml |  6 ++++--
 .gitignore                      |  2 +-
 deploy.sh                       | 16 ++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy-s3.yml b/.github/workflows/deploy-s3.yml
index c68b3e0..da011a2 100644
--- a/.github/workflows/deploy-s3.yml
+++ b/.github/workflows/deploy-s3.yml
@@ -22,5 +22,7 @@ jobs:
           access_key: ${{ secrets.MINIO_ACCESS_KEY }}
           secret_key: ${{ secrets.MINIO_SECRET_KEY }}
           bucket: ${{ secrets.MINIO_BUCKET }}
-          source_dir: './archives'
-          target_dir: '/preinstalls'
\ No newline at end of file
+          source_dir: './out'
+          target_dir: '/preinstalls'
+      - name: Clean up
+        run: rm -rf ./out
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 1266743..8c39ec3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -255,5 +255,5 @@ dist
 .pnp.*
 # END OF NODE GITIGNORE
 
-archives/
+out/
 *.zip
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
index c54d101..d93e186 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,12 +2,8 @@
 
 oldDir=$(pwd)
 
-function cleanup() {
-    rm -rf archives >/dev/null 2>&1
-}
-
-cleanup
-mkdir archives
+rm -rf out >/dev/null 2>&1
+mkdir out
 
 for d in $(find . -type d); do
   if [ -f "$d/manifest.json" ]; then
@@ -15,11 +11,15 @@ for d in $(find . -type d); do
     echo "Processing $dir_name..."
     cd "$d"
     zip -r "$dir_name.zip" .
-    mv "$dir_name.zip" "$oldDir/archives/."
+    mv "$dir_name.zip" "$oldDir/out/."
     cd $oldDir
     echo "$dir_name completed."
     echo ""
   fi
 done
 
-cleanup
\ No newline at end of file
+echo "Copying minecraft-java/core-configs"
+cp -r minecraft-java/core-configs/* "out/."
+
+echo "Copying additional-configs/pteroignore"
+cp "additional-configs/pteroignore/.pteroignore" "out/."
\ No newline at end of file