From d84df12d3b03424663ffe54f6844db9a6ec58dde Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 12 Feb 2021 22:48:57 +0100
Subject: [PATCH] bug: fixing the input path to the FilePreparer, and fixing
 the destination directory for the preparer to template

---
 .../src/scaffolder/stages/prepare/file.ts                   | 6 +++---
 plugins/scaffolder-backend/src/service/router.ts            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/file.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/file.ts
index 4d49ba222e..7e4e542165 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/file.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/file.ts
@@ -25,12 +25,12 @@ export class FilePreparer implements PreparerBase {
       throw new InputError(`Wrong location protocol, should be 'file', ${url}`);
     }
 
-    const checkoutDir = path.join(workspacePath, 'checkout');
-    await fs.ensureDir(checkoutDir);
+    const templateDir = path.join(workspacePath, 'template');
+    await fs.ensureDir(templateDir);
 
     const templatePath = fileURLToPath(url);
 
-    await fs.copy(templatePath, checkoutDir, {
+    await fs.copy(templatePath, templateDir, {
       recursive: true,
     });
   }
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 51425f75e8..e8aa9e7c43 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -17,7 +17,7 @@
 import { Config } from '@backstage/config';
 import Docker from 'dockerode';
 import express from 'express';
-import { resolve as resolvePath } from 'path';
+import { resolve as resolvePath, dirname } from 'path';
 import Router from 'express-promise-router';
 import { Logger } from 'winston';
 import {
@@ -164,7 +164,7 @@ export async function createRouter(
                 const preparer = new FilePreparer();
 
                 const path = resolvePath(
-                  templateEntityLocation,
+                  dirname(templateEntityLocation),
                   template.spec.path || '.',
                 );