Use basename for whats-that-gerber

kitspace · Sep 12, 2018 · ac16fe0 · ac16fe0
1 parent 757d7f9
commit ac16fe0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/gerber_files.js b/src/gerber_files.js
@@ -7,7 +7,7 @@ function gerberFiles(files, gerberPath) {
     files = files.filter(f => regex.test(f))
   }
   const layers = files
-    .map(f => ({path: f, type: whatsThatGerber(f)}))
+    .map(f => ({path: f, type: whatsThatGerber(path.basename(f))}))
     .filter(({type}) => type !== 'drw')
   const possibleGerbers = layers.map(({path}) => path)
   const possibleTypes = layers.map(({type}) => type)

diff --git a/src/submit/url_submit.jsx b/src/submit/url_submit.jsx
@@ -225,7 +225,7 @@ const UrlSubmit = React.createClass({
               return superagent
                 .get(url.resolve(GIT_CLONE_SERVER, path.join(root, f)))
                 .withCredentials()
-                .then(res => ({gerber: res.text, filename: f}))
+                .then(res => ({gerber: res.text, filename: path.basename(f)}))
             })
             Promise.all(requests).then(buildBoard.bind(null, dispatch))
             dispatch({type: 'setFileListing', value: files})

diff --git a/tasks/page/processGerbers.js b/tasks/page/processGerbers.js
@@ -79,7 +79,7 @@ if (require.main !== module) {
     const stackupData = []
     for (let gerberPath of gerbers) {
       data = fs.readFileSync(gerberPath, {encoding: 'utf8'})
-      stackupData.push({filename: gerberPath, gerber: data})
+      stackupData.push({filename: path.basename(gerberPath), gerber: data})
       zip.file(path.join(folder_name, path.basename(gerberPath)), data)
     }
     zip