From 37b4ad5d25bef41502d7e584020ab03d4920085e Mon Sep 17 00:00:00 2001
From: Julian Waller <git@julusian.co.uk>
Date: Mon, 13 Jan 2025 17:32:44 +0000
Subject: [PATCH] wip: tidy dist and try upload

---
 .github/workflows/linux-system.yml | 16 +++++++++-------
 tools/linux/launch-interactive     |  2 --
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100755 tools/linux/launch-interactive

diff --git a/.github/workflows/linux-system.yml b/.github/workflows/linux-system.yml
index 0a9b5d3c7e..88719166b9 100644
--- a/.github/workflows/linux-system.yml
+++ b/.github/workflows/linux-system.yml
@@ -80,8 +80,8 @@ jobs:
                 mv ../*.deb dist/
 
                 # TODO - collect a readme or something
-
-                zip -r "${{ steps.setup-env.outputs.BUILD_FILENAME }}.zip" dist
+                cp README.md dist/
+                cp tools/linux/deb/INSTALLING dist/
 
                 # check if a release branch, or master, or a tag
                 if [[ "${{ github.ref_name }}" == "master" || "${{ github.ref_name }}" == "2.3.x-lts" ]]
@@ -89,12 +89,14 @@ jobs:
                   # Only proceed if we have an sftp password
                   if [ -n "${{ secrets.SFTP_PASSWORD }}" ]
                   then
+                    zip -r "${{ steps.setup-env.outputs.BUILD_FILENAME }}.zip" dist
+
                     # TODO - upload to website
-                    #   set -x
-                    #   eval $(ssh-agent -s)
-                    #   mkdir -v -m 700 $HOME/.ssh
-                    #   ssh-keyscan -H ${{ secrets.SFTP_HOST }} > $HOME/.ssh/known_hosts
-                    #   sshpass -p "${{ secrets.SFTP_PASSWORD }}" scp -r "${{ steps.rename-build.outputs.uploadname }}" "${{ secrets.SFTP_USERNAME }}@${{ secrets.SFTP_HOST }}:${{ secrets.SFTP_ROOT }}/${{ github.ref_name }}/${{ steps.rename-build.outputs.uploadname }}"
+                    set -x
+                    eval $(ssh-agent -s)
+                    mkdir -v -m 700 $HOME/.ssh
+                    ssh-keyscan -H ${{ secrets.SFTP_HOST }} > $HOME/.ssh/known_hosts
+                    sshpass -p "${{ secrets.SFTP_PASSWORD }}" scp -r "${{ steps.setup-env.outputs.BUILD_FILENAME }}.zip" "${{ secrets.SFTP_USERNAME }}@${{ secrets.SFTP_HOST }}:${{ secrets.SFTP_ROOT }}/${{ github.ref_name }}/${{ steps.setup-env.outputs.BUILD_FILENAME }}.zip"
                   fi
                 fi
 
diff --git a/tools/linux/launch-interactive b/tools/linux/launch-interactive
deleted file mode 100755
index 3bcdbbdf9d..0000000000
--- a/tools/linux/launch-interactive
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-docker run --rm -it casparcg/server /bin/bash