From 0b40f49f43d15e48dc4bcaa79596bd335c0e1cfa Mon Sep 17 00:00:00 2001 From: Ben Olden-Cooligan Date: Fri, 12 Jul 2024 13:28:26 -0700 Subject: [PATCH] Tools: Fix apt metadata updating --- NAPS2.Tools/Project/Releasing/UploadCommand.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/NAPS2.Tools/Project/Releasing/UploadCommand.cs b/NAPS2.Tools/Project/Releasing/UploadCommand.cs index fd5de52942..66b29a19fb 100644 --- a/NAPS2.Tools/Project/Releasing/UploadCommand.cs +++ b/NAPS2.Tools/Project/Releasing/UploadCommand.cs @@ -241,10 +241,11 @@ private void UpdateAptMetadata() } Directory.CreateDirectory(aptTemp); - Cli.Run("ssh", "user@downloads.naps2.com \"mkdir -p /home/user/apt-temp/\""); - Cli.Run("ssh", "user@downloads.naps2.com \"cd /var/www/html/ ; apt-ftparchive packages . > /home/user/apt-temp/Packages\" ; apt-ftparchive release . > /home/user/apt-temp/Release\""); - Cli.Run("scp", $"user@downloads.naps2.com:/home/user/apt-temp/Packages {Path.Combine(aptTemp, "Packages")}"); - Cli.Run("scp", $"user@downloads.naps2.com:/home/user/apt-temp/Release {Path.Combine(aptTemp, "Release")}"); + Cli.Run("ssh", "user@downloads.naps2.com \"mkdir -p /home/user/apt-temp-packages/\""); + Cli.Run("ssh", "user@downloads.naps2.com \"mkdir -p /home/user/apt-temp-release/\""); + Cli.Run("ssh", "user@downloads.naps2.com \"cd /var/www/html/ ; apt-ftparchive packages . > /home/user/apt-temp-packages/Packages\" ; apt-ftparchive release /home/user/apt-temp-packages/ > /home/user/apt-temp-release/Release\""); + Cli.Run("scp", $"user@downloads.naps2.com:/home/user/apt-temp-packages/Packages {Path.Combine(aptTemp, "Packages")}"); + Cli.Run("scp", $"user@downloads.naps2.com:/home/user/apt-temp-release/Release {Path.Combine(aptTemp, "Release")}"); Cli.Run("gpg", $"--output {Path.Combine(aptTemp, "Release.gpg")} --sign {Path.Combine(aptTemp, "Release")}"); Cli.Run("gpg", $"--output {Path.Combine(aptTemp, "InRelease")} --clearsign {Path.Combine(aptTemp, "Release")}"); Cli.Run("scp", $"{Path.Combine(aptTemp, "Packages")} user@downloads.naps2.com:/var/www/html/Packages");