From 296a5d3429398476a51b055fbf1097a43f05c3cb Mon Sep 17 00:00:00 2001 From: Minecon724 Date: Fri, 11 Oct 2024 11:26:42 +0200 Subject: [PATCH] actually fix workflow --- .forgejo/workflows/deploy.yml | 2 +- deploy.sh | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 0de77e6..41ec38d 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -7,7 +7,7 @@ jobs: - run: git clone https://git.m724.eu/Minecon724/dn42-info . - run: npm i - run: npx parcel build src/index.html - - run: chmod +x deploy.sh && ./deploy.sh + - run: apt install ftp -y && chmod +x deploy.sh && ./deploy.sh env: FTP_SERVER: ${{ secrets.FTP_SERVER }} FTP_USER: ${{ secrets.FTP_USER }} diff --git a/deploy.sh b/deploy.sh index 4a4d4bf..d72abba 100644 --- a/deploy.sh +++ b/deploy.sh @@ -8,14 +8,8 @@ ftp -n << EOF open $FTP_SERVER user $FTP_USER $FTP_PASSWORD -# Upload HTML files -for file in *.html; do - put "$file" -done - -# Upload geofeed.csv (assuming it's in the parent directory) -cd .. -put geofeed.csv +put -r . +put ../geofeed.csv # Close FTP connection bye