From deb1c9407eb99851730bf8118f481ab3c6273251 Mon Sep 17 00:00:00 2001
From: Peter Hedenskog <peter@soulgalore.com>
Date: Mon, 11 Jul 2022 22:44:57 +0200
Subject: [PATCH] Upload latest files to correct location (#3693)

---
 lib/plugins/scp/index.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/scp/index.js b/lib/plugins/scp/index.js
index ffaad9400..9a28973e9 100644
--- a/lib/plugins/scp/index.js
+++ b/lib/plugins/scp/index.js
@@ -53,14 +53,14 @@ async function upload(dir, scpOptions, prefix) {
   }
 }
 
-async function uploadFiles(files, scpOptions) {
+async function uploadFiles(files, scpOptions, prefix) {
   let client;
   try {
     client = await getClient(scpOptions);
     for (let file of files) {
       await client.uploadFile(
         file,
-        path.join(scpOptions.destinationPath, path.basename(file))
+        path.join(scpOptions.destinationPath, prefix, path.basename(file))
       );
     }
   } catch (e) {
@@ -73,13 +73,13 @@ async function uploadFiles(files, scpOptions) {
   }
 }
 
-async function uploadLatestFiles(dir, scpOptions) {
+async function uploadLatestFiles(dir, scpOptions, prefix) {
   function ignoreDirs(file, stats) {
     return stats.isDirectory();
   }
   const files = await readdir(dir, [ignoreDirs]);
 
-  return uploadFiles(files, scpOptions);
+  return uploadFiles(files, scpOptions, prefix);
 }
 
 module.exports = {
@@ -111,7 +111,9 @@ module.exports = {
         );
         if (this.options.copyLatestFilesToBase) {
           const rootPath = path.resolve(baseDir, '..');
-          await uploadLatestFiles(rootPath, this.scpOptions);
+          const prefix = this.storageManager.getStoragePrefix();
+          const firstPart = prefix.split('/')[0];
+          await uploadLatestFiles(rootPath, this.scpOptions, firstPart);
         }
         log.info('Finished upload using scp');
         if (this.scpOptions.removeLocalResult) {