From 7a872f50f7fc5a896e69fee871c7568fed8c646e Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:44:25 +0100
Subject: [PATCH 01/10] Update ftp-deploy.yml (Git-FTP)

Change method from LFTP (updated all files every time, not just newest) to Git-FTP.
---
 .github/workflows/ftp-deploy.yml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index 8428b46..bfd0f35 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -4,13 +4,23 @@ jobs:
   ftp-deploy:
     runs-on: ubuntu-latest
     steps:
-      - name: 🛒 Checkout
-        uses: actions/checkout@v2
-      - name: 📦 Get LFTP
-        run: sudo apt install lftp
-      - name: 🛠️ Configure LFTP
-        run: mkdir ~/.lftp && echo "set ssl:verify-certificate no; set cmd:default-protocol sftp; set sftp:auto-confirm true;" >> ~/.lftp/rc
+      - name: 💿 Install Git-FTP
+        run: sudo apt-get install git-ftp
+      - name: 🛠️ Configure Git-FTP
+        run: |
+          git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}" \
+          git config git-ftp.user "${{ secrets.SFTP_USERNAME }}" \
+          git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
+      - name: ⬆️ Push
+        run: git ftp push --auto-init
+          
+      #- name: 🛒 Checkout
+      #  uses: actions/checkout@v2
+      #- name: 📦 Get LFTP
+      #  run: sudo apt install lftp
+      #- name: 🛠️ Configure LFTP
+      #  run: mkdir ~/.lftp && echo "set ssl:verify-certificate no; set cmd:default-protocol sftp; set sftp:auto-confirm true;" >> ~/.lftp/rc
       #- name: 🔑 Load Secrets
       #  run: echo "machine ${{ secrets.SFTP_HOSTNAME }} login ${{ secrets.SFTP_USERNAME }} password '${{ secrets.SFTP_PASSWORD }}'" > ~/.netrc
-      - name: 📁 Upload Folder
-        run: lftp -u ${{ secrets.SFTP_USERNAME }},'${{ secrets.SFTP_PASSWORD }}' -e "mirror --delete-first --no-recursion --parallel=100 -I *.tti -R ./ /" sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}
+      #- name: 📁 Upload Folder
+      #  run: lftp -u ${{ secrets.SFTP_USERNAME }},'${{ secrets.SFTP_PASSWORD }}' -e "mirror --delete-first --no-recursion --parallel=100 -I *.tti -R ./ /" sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}

From 54b152fc5f0dc668a23b6adac6f54a8549dd09d0 Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:49:13 +0100
Subject: [PATCH 02/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index bfd0f35..b3b296e 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -9,8 +9,8 @@ jobs:
       - name: 🛠️ Configure Git-FTP
         run: |
           git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}" \
-          git config git-ftp.user "${{ secrets.SFTP_USERNAME }}" \
-          git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
+            git config git-ftp.user "${{ secrets.SFTP_USERNAME }}" \
+            git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
       - name: ⬆️ Push
         run: git ftp push --auto-init
           

From f6c73affb7234595ca1a27f9ecfa177fc98c9ea5 Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:50:58 +0100
Subject: [PATCH 03/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index b3b296e..1701922 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -8,9 +8,9 @@ jobs:
         run: sudo apt-get install git-ftp
       - name: 🛠️ Configure Git-FTP
         run: |
-          git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}" \
-            git config git-ftp.user "${{ secrets.SFTP_USERNAME }}" \
-            git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
+          git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}"
+          git config git-ftp.user "${{ secrets.SFTP_USERNAME }}"
+          git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
       - name: ⬆️ Push
         run: git ftp push --auto-init
           

From c97d4feea8eaaf51a7fc383083e18380808bde7a Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:56:46 +0100
Subject: [PATCH 04/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index 1701922..94227fd 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -6,13 +6,20 @@ jobs:
     steps:
       - name: 💿 Install Git-FTP
         run: sudo apt-get install git-ftp
-      - name: 🛠️ Configure Git-FTP
-        run: |
-          git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}"
-          git config git-ftp.user "${{ secrets.SFTP_USERNAME }}"
-          git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
+        
+      #- name: 🛠️ Configure Git-FTP
+      #  run: |
+      #    git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}"
+      #    git config git-ftp.user "${{ secrets.SFTP_USERNAME }}"
+      #    git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
+      
       - name: ⬆️ Push
-        run: git ftp push --auto-init
+        run: >
+          git ftp push
+          --auto-init
+          --user ${{ secrets.SFTP_USERNAME }}
+          --passwd ${{ secrets.SFTP_PASSWORD }}
+          sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}
           
       #- name: 🛒 Checkout
       #  uses: actions/checkout@v2

From 51bd76277dff6ad7aecc4f712595e846a4859a65 Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:59:03 +0100
Subject: [PATCH 05/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index 94227fd..06f7b77 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -4,22 +4,20 @@ jobs:
   ftp-deploy:
     runs-on: ubuntu-latest
     steps:
+      - name: 🛒 Checkout
+        uses: actions/checkout@v2
+      
       - name: 💿 Install Git-FTP
         run: sudo apt-get install git-ftp
         
-      #- name: 🛠️ Configure Git-FTP
-      #  run: |
-      #    git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}"
-      #    git config git-ftp.user "${{ secrets.SFTP_USERNAME }}"
-      #    git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
+      - name: 🛠️ Configure Git-FTP
+        run: |
+          git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}"
+          git config git-ftp.user "${{ secrets.SFTP_USERNAME }}"
+          git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
       
       - name: ⬆️ Push
-        run: >
-          git ftp push
-          --auto-init
-          --user ${{ secrets.SFTP_USERNAME }}
-          --passwd ${{ secrets.SFTP_PASSWORD }}
-          sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}
+        run: git ftp push --auto-init
           
       #- name: 🛒 Checkout
       #  uses: actions/checkout@v2

From 44c465078e151decbc0e39318fd461fb1a619af4 Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 16:01:40 +0100
Subject: [PATCH 06/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index 06f7b77..653e9b5 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -7,8 +7,8 @@ jobs:
       - name: 🛒 Checkout
         uses: actions/checkout@v2
       
-      - name: 💿 Install Git-FTP
-        run: sudo apt-get install git-ftp
+      #- name: 💿 Install Git-FTP
+      #  run: sudo apt-get install git-ftp
         
       - name: 🛠️ Configure Git-FTP
         run: |
@@ -17,7 +17,7 @@ jobs:
           git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
       
       - name: ⬆️ Push
-        run: git ftp push --auto-init
+        run: git ftp push --auto-init --insecure
           
       #- name: 🛒 Checkout
       #  uses: actions/checkout@v2

From 410dc4539af5c9abe9fc4a304b29c403de074592 Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 16:31:20 +0100
Subject: [PATCH 07/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index 653e9b5..6768c26 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -12,12 +12,13 @@ jobs:
         
       - name: 🛠️ Configure Git-FTP
         run: |
-          git config git-ftp.url "sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}"
-          git config git-ftp.user "${{ secrets.SFTP_USERNAME }}"
-          git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
+          git config git-ftp.url sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}
+          git config git-ftp.user ${{ secrets.SFTP_USERNAME }}
+          git config git-ftp.password ${{ secrets.SFTP_PASSWORD }}
+          git config git-ftp.insecure 1
       
       - name: ⬆️ Push
-        run: git ftp push --auto-init --insecure
+        run: git ftp push --auto-init
           
       #- name: 🛒 Checkout
       #  uses: actions/checkout@v2

From 8a0298e4affb0b9f0fa0a9b6522f1e4193ebd90a Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 17:09:19 +0100
Subject: [PATCH 08/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index 6768c26..9e72c26 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -14,8 +14,9 @@ jobs:
         run: |
           git config git-ftp.url sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}
           git config git-ftp.user ${{ secrets.SFTP_USERNAME }}
-          git config git-ftp.password ${{ secrets.SFTP_PASSWORD }}
+          git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
           git config git-ftp.insecure 1
+          git config git-ftp.remoteroot var/www/jamienemeth.co.uk/teletext/services/nemetext
       
       - name: ⬆️ Push
         run: git ftp push --auto-init

From 13d9d9f6e4a8502359a4934027f4a7e76c6435fc Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 17:11:10 +0100
Subject: [PATCH 09/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index 9e72c26..219b00b 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -14,12 +14,10 @@ jobs:
         run: |
           git config git-ftp.url sftp://${{ secrets.SFTP_HOSTNAME }}:${{ secrets.SFTP_PORT }}
           git config git-ftp.user ${{ secrets.SFTP_USERNAME }}
-          git config git-ftp.password "${{ secrets.SFTP_PASSWORD }}"
           git config git-ftp.insecure 1
-          git config git-ftp.remoteroot var/www/jamienemeth.co.uk/teletext/services/nemetext
       
       - name: ⬆️ Push
-        run: git ftp push --auto-init
+        run: git ftp push --passwd "${{ secrets.SFTP_PASSWORD }}" --auto-init
           
       #- name: 🛒 Checkout
       #  uses: actions/checkout@v2

From d003cd0c69710c732bad15d5211af3d5a5d2fd28 Mon Sep 17 00:00:00 2001
From: Jamie Nemeth <125909011+JamieNemeth@users.noreply.github.com>
Date: Tue, 30 Apr 2024 17:13:34 +0100
Subject: [PATCH 10/10] Update ftp-deploy.yml

---
 .github/workflows/ftp-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml
index 219b00b..fb85e06 100644
--- a/.github/workflows/ftp-deploy.yml
+++ b/.github/workflows/ftp-deploy.yml
@@ -17,7 +17,7 @@ jobs:
           git config git-ftp.insecure 1
       
       - name: ⬆️ Push
-        run: git ftp push --passwd "${{ secrets.SFTP_PASSWORD }}" --auto-init
+        run: git ftp push --passwd '${{ secrets.SFTP_PASSWORD }}' --auto-init
           
       #- name: 🛒 Checkout
       #  uses: actions/checkout@v2