c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support list micro:bit on linux

Browse Source
This commit is contained in:
Peli de Halleux 2016-09-06 00:12:57 -07:00
parent ac8c9c5e85
commit 1bd19cc1a0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmds/cmds.ts
View File

@ -28,7 +28,7 @@ export function deployCoreAsync(res: ts.pxtc.CompileResult) {
function getBitDrivesAsync(): Promise<string[]> { function getBitDrivesAsync(): Promise<string[]> {
if (process.platform == "win32") { if (process.platform == "win32") {
let rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives) const rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
return execAsync("wmic PATH Win32_LogicalDisk get DeviceID, VolumeName, FileSystem") return execAsync("wmic PATH Win32_LogicalDisk get DeviceID, VolumeName, FileSystem")
.then(buf => { .then(buf => {
let res: string[] = [] let res: string[] = []
@ -42,9 +42,14 @@ function getBitDrivesAsync(): Promise<string[]> {
}) })
} }
else if (process.platform == "darwin") { else if (process.platform == "darwin") {
let rx = new RegExp(pxt.appTarget.compile.deployDrives) const rx = new RegExp(pxt.appTarget.compile.deployDrives)
return readDirAsync("/Volumes") return readDirAsync("/Volumes")
.then(lst => lst.filter(s => rx.test(s)).map(s => "/Volumes/" + s + "/")) .then(lst => lst.filter(s => rx.test(s)).map(s => "/Volumes/" + s + "/"))
} else if (process.platform == "linux") {
const rx = new RegExp(pxt.appTarget.compile.deployDrives)
const user = process.env["USER"]
return readDirAsync(`/media/${user}`)
.then(lst => lst.filter(s => rx.test(s)).map(s => `/media/${user}/${s}/`))
} else { } else {
return Promise.resolve([]) return Promise.resolve([])
} }