Windows glide duplicate deployables fix (#22)

* Changed windows command for finding deployables to ensure that the same file is not found multiple times

* Added replace to remove file paths in glide prepare

* version

* version

Author: Daniel-Estoll

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "polyapi",
-  "version": "0.24.6",
+  "version": "0.24.7",
   "description": "Poly is a CLI tool to help create and manage your Poly definitions.",
   "license": "MIT",
   "repository": {

package.json

@@ -162,13 +162,16 @@ export const prepareDeployables = async (
     );
     const staged = shell.exec('git diff --name-only --cached', {silent:true})
       .toString().split('\n').filter(Boolean);
+    const rootPath: string = shell.exec('git rev-parse --show-toplevel', {silent:true})
+      .toString('utf8').replace('\n', '');
     for (const deployable of dirtyDeployables) {
       try{
-        if (staged.includes(deployable.file)) {
-          shell.echo(`Staging ${deployable.file}`);
-          shell.exec(`git add ${deployable.file}`);
+        const deployableName = deployable.file.replace(`${rootPath}/`, '');
+        if (staged.includes(deployableName)) {
+          shell.echo(`Staging ${deployableName}`);
+          shell.exec(`git add ${deployableName}`);
         }
-      }
+      } 
       catch (error) {
         console.warn(error);
       }

src/commands/prepare.ts

@@ -183,7 +183,7 @@ export const getAllDeployableFilesWindows = ({
   const excludeCommand = excludePattern
     ? ` | findstr /V /I "${excludePattern}"`
     : '';
-  const searchCommand = ` | findstr /M /I /S /F:/ ${pattern} *.*`;
+  const searchCommand = ` | findstr /M /I /F:/ ${pattern}`;
 
   let result: string[] = [];
   for (const dir of includeDirs) {
@@ -195,7 +195,7 @@ export const getAllDeployableFilesWindows = ({
         : includeFilesOrExtensions
           .map((f) => (f.includes('.') ? f : `${dir}*.${f}`))
           .join(' ');
-    const dirCommand = `dir ${includePattern} /S /P /B > NUL`;
+    const dirCommand = `dir ${includePattern} /S /P /B `;
     const fullCommand = `${dirCommand}${excludeCommand}${searchCommand}`;
     try {
       const output = shell.exec(fullCommand, {silent:true}).toString('utf8');